update memoryview eq

qingshi163 · qingshi163 · commit 604bd055e712 · 2020-10-06T09:46:50.000+02:00
diff --git a/vm/src/obj/objmemory.rs b/vm/src/obj/objmemory.rs
@@ -610,33 +610,43 @@ impl PyMemoryView {
         if zelf.released.load() {
             return Ok(false);
         }
+
         let options_cmp = |a: &BufferOptions, b: &BufferOptions| -> bool {
             a.len == b.len && a.itemsize == b.itemsize
         };
-        // TODO: fast pass for contiguous buffer
-        match other.clone().downcast::<PyMemoryView>() {
-            Ok(other) => {
-                if options_cmp(&zelf.options, &other.options) {
-                    let a = Self::tolist(zelf.clone(), vm)?;
-                    let b = Self::tolist(other, vm)?;
-                    if vm.bool_eq(a.as_object(), b.as_object())? {
-                        return Ok(true);
-                    }
-                }
+
+        let other = try_buffer_from_object(vm, other)?;
+
+        if !options_cmp(&zelf.options, &other.get_options()) {
+            return Ok(false);
+        }
+
+        let a_guard;
+        let a_vec;
+        let a = match zelf.as_contiguous() {
+            Some(bytes) => {
+                a_guard = bytes;
+                &*a_guard
             }
-            Err(other) => {
-                if let Ok(buffer) = try_buffer_from_object(vm, &other) {
-                    let options = buffer.get_options();
-                    // FIXME
-                    if options_cmp(&zelf.options, &options)
-                        && (**(Self::tobytes(zelf.clone(), vm)?) == *buffer.obj_bytes())
-                    {
-                        return Ok(true);
-                    }
-                }
+            None => {
+                a_vec = zelf.to_contiguous();
+                a_vec.as_slice()
             }
-        }
-        Ok(false)
+        };
+        let b_guard;
+        let b_vec;
+        let b = match other.as_contiguous() {
+            Some(bytes) => {
+                b_guard = bytes;
+                &*b_guard
+            }
+            None => {
+                b_vec = other.to_contiguous();
+                b_vec.as_slice()
+            }
+        };
+
+        Ok(a == b)
     }
 }
 
