Fix irrefutable pattern errors

OddCoincidence · OddCoincidence · commit 6024e3ea0c70 · 2019-03-10T12:43:25.000-07:00
diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
@@ -1537,11 +1537,8 @@ impl PyObject {
     }
 
     pub fn payload<T: PyObjectPayload2>(&self) -> Option<&T> {
-        if let PyObjectPayload::AnyRustValue { ref value } = self.payload {
-            value.downcast_ref()
-        } else {
-            None
-        }
+        let PyObjectPayload::AnyRustValue { ref value } = self.payload;
+        value.downcast_ref()
     }
 }
 
diff --git a/vm/src/stdlib/re.rs b/vm/src/stdlib/re.rs
@@ -191,20 +191,19 @@ fn match_end(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
 
 /// Retrieve inner rust regex from python object:
 fn get_regex<'a>(obj: &'a PyObjectRef) -> &'a Regex {
-    if let PyObjectPayload::AnyRustValue { ref value } = obj.payload {
-        if let Some(regex) = value.downcast_ref::<Regex>() {
-            return regex;
-        }
+    // TODO: Regex shouldn't be stored in payload directly, create newtype wrapper
+    let PyObjectPayload::AnyRustValue { ref value } = obj.payload;
+    if let Some(regex) = value.downcast_ref::<Regex>() {
+        return regex;
     }
     panic!("Inner error getting regex {:?}", obj);
 }
 
 /// Retrieve inner rust match from python object:
 fn get_match<'a>(obj: &'a PyObjectRef) -> &'a PyMatch {
-    if let PyObjectPayload::AnyRustValue { ref value } = obj.payload {
-        if let Some(value) = value.downcast_ref::<PyMatch>() {
-            return value;
-        }
+    let PyObjectPayload::AnyRustValue { ref value } = obj.payload;
+    if let Some(value) = value.downcast_ref::<PyMatch>() {
+        return value;
     }
     panic!("Inner error getting match {:?}", obj);
 }
diff --git a/vm/src/stdlib/socket.rs b/vm/src/stdlib/socket.rs
@@ -127,10 +127,9 @@ impl Socket {
 }
 
 fn get_socket<'a>(obj: &'a PyObjectRef) -> impl DerefMut<Target = Socket> + 'a {
-    if let PyObjectPayload::AnyRustValue { ref value } = obj.payload {
-        if let Some(socket) = value.downcast_ref::<RefCell<Socket>>() {
-            return socket.borrow_mut();
-        }
+    let PyObjectPayload::AnyRustValue { ref value } = obj.payload;
+    if let Some(socket) = value.downcast_ref::<RefCell<Socket>>() {
+        return socket.borrow_mut();
     }
     panic!("Inner error getting socket {:?}", obj);
 }

Original file line number	Diff line number	Diff line change
`@@ -1537,11 +1537,8 @@ impl PyObject {`
`1537`	`1537`	`}`
`1538`	`1538`
`1539`	`1539`	`pub fn payload<T: PyObjectPayload2>(&self) -> Option<&T> {`
`1540`		`- if let PyObjectPayload::AnyRustValue { ref value } = self.payload {`
`1541`		`- value.downcast_ref()`
`1542`		`- } else {`
`1543`		`- None`
`1544`		`- }`
	`1540`	`+ let PyObjectPayload::AnyRustValue { ref value } = self.payload;`
	`1541`	`+ value.downcast_ref()`
`1545`	`1542`	`}`
`1546`	`1543`	`}`
`1547`	`1544`
Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,9 @@ impl Socket {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`fn get_socket<'a>(obj: &'a PyObjectRef) -> impl DerefMut<Target = Socket> + 'a {`
`130`		`- if let PyObjectPayload::AnyRustValue { ref value } = obj.payload {`
`131`		`- if let Some(socket) = value.downcast_ref::<RefCell<Socket>>() {`
`132`		`- return socket.borrow_mut();`
`133`		`- }`
	`130`	`+ let PyObjectPayload::AnyRustValue { ref value } = obj.payload;`
	`131`	`+ if let Some(socket) = value.downcast_ref::<RefCell<Socket>>() {`
	`132`	`+ return socket.borrow_mut();`
`134`	`133`	`}`
`135`	`134`	`panic!("Inner error getting socket {:?}", obj);`
`136`	`135`	`}`