rename for name consistency

gogim1 · gogim1 · commit 19f3121f886a · 2022-06-19T18:06:18.000+08:00
diff --git a/stdlib/src/array.rs b/stdlib/src/array.rs
@@ -287,7 +287,7 @@ mod array {
                     match self {
                         $(ArrayContentType::$n(v) => {
                             let value = <$t>::try_into_from_object(vm, value)?;
-                            v.set_item_by_index(vm, i, value)
+                            v.setitem_by_index(vm, i, value)
                         })*
                     }
                 }
@@ -300,7 +300,7 @@ mod array {
                 ) -> PyResult<()> {
                     match self {
                         $(Self::$n(elements) => if let ArrayContentType::$n(items) = items {
-                            elements.set_item_by_slice(vm, slice, items)
+                            elements.setitem_by_slice(vm, slice, items)
                         } else {
                             Err(vm.new_type_error(
                                 "bad argument type for built-in operation".to_owned()
@@ -317,7 +317,7 @@ mod array {
                 ) -> PyResult<()> {
                     match self {
                         $(Self::$n(elements) => if let ArrayContentType::$n(items) = items {
-                            elements.set_item_by_slice_no_resize(vm, slice, items)
+                            elements.setitem_by_slice_no_resize(vm, slice, items)
                         } else {
                             Err(vm.new_type_error(
                                 "bad argument type for built-in operation".to_owned()
diff --git a/vm/src/builtins/bytearray.rs b/vm/src/builtins/bytearray.rs
@@ -160,7 +160,7 @@ impl PyByteArray {
 
     fn _setitem_by_index(&self, i: isize, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         let value = value_from_object(vm, &value)?;
-        self.borrow_buf_mut().set_item_by_index(vm, i, value)
+        self.borrow_buf_mut().setitem_by_index(vm, i, value)
     }
 
     fn _setitem(
@@ -178,10 +178,10 @@ impl PyByteArray {
                     bytes_from_object(vm, &value)?
                 };
                 if let Some(mut w) = zelf.try_resizable_opt() {
-                    w.elements.set_item_by_slice(vm, slice, &items)
+                    w.elements.setitem_by_slice(vm, slice, &items)
                 } else {
                     zelf.borrow_buf_mut()
-                        .set_item_by_slice_no_resize(vm, slice, &items)
+                        .setitem_by_slice_no_resize(vm, slice, &items)
                 }
             }
         }
diff --git a/vm/src/builtins/list.rs b/vm/src/builtins/list.rs
@@ -213,10 +213,10 @@ impl PyList {
 
     fn _setitem(&self, needle: &PyObject, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         match SequenceIndex::try_from_borrowed_object(vm, needle, "list")? {
-            SequenceIndex::Int(index) => self.borrow_vec_mut().set_item_by_index(vm, index, value),
+            SequenceIndex::Int(index) => self.borrow_vec_mut().setitem_by_index(vm, index, value),
             SequenceIndex::Slice(slice) => {
                 let sec = extract_cloned(&*value, Ok, vm)?;
-                self.borrow_vec_mut().set_item_by_slice(vm, slice, &sec)
+                self.borrow_vec_mut().setitem_by_slice(vm, slice, &sec)
             }
         }
     }
@@ -451,7 +451,7 @@ impl AsSequence for PyList {
         ass_item: Some(|seq, i, value, vm| {
             let zelf = Self::sequence_downcast(seq);
             if let Some(value) = value {
-                zelf.borrow_vec_mut().set_item_by_index(vm, i, value)
+                zelf.borrow_vec_mut().setitem_by_index(vm, i, value)
             } else {
                 zelf.borrow_vec_mut().del_item_by_index(vm, i)
             }
diff --git a/vm/src/sliceable.rs b/vm/src/sliceable.rs
@@ -24,7 +24,7 @@ where
     where
         I: Iterator<Item = usize>;
 
-    fn set_item_by_index(
+    fn setitem_by_index(
         &mut self,
         vm: &VirtualMachine,
         index: isize,
@@ -38,7 +38,7 @@ where
         Ok(())
     }
 
-    fn set_item_by_slice_no_resize(
+    fn setitem_by_slice_no_resize(
         &mut self,
         vm: &VirtualMachine,
         slice: SaturatedSlice,
@@ -60,7 +60,7 @@ where
         }
     }
 
-    fn set_item_by_slice(
+    fn setitem_by_slice(
         &mut self,
         vm: &VirtualMachine,
         slice: SaturatedSlice,

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ impl PyByteArray {`
`160`	`160`
`161`	`161`	`fn _setitem_by_index(&self, i: isize, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`162`	`162`	`let value = value_from_object(vm, &value)?;`
`163`		`- self.borrow_buf_mut().set_item_by_index(vm, i, value)`
	`163`	`+ self.borrow_buf_mut().setitem_by_index(vm, i, value)`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`fn _setitem(`
`@@ -178,10 +178,10 @@ impl PyByteArray {`
`178`	`178`	`bytes_from_object(vm, &value)?`
`179`	`179`	`};`
`180`	`180`	`if let Some(mut w) = zelf.try_resizable_opt() {`
`181`		`- w.elements.set_item_by_slice(vm, slice, &items)`
	`181`	`+ w.elements.setitem_by_slice(vm, slice, &items)`
`182`	`182`	`} else {`
`183`	`183`	`zelf.borrow_buf_mut()`
`184`		`- .set_item_by_slice_no_resize(vm, slice, &items)`
	`184`	`+ .setitem_by_slice_no_resize(vm, slice, &items)`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,10 +213,10 @@ impl PyList {`
`213`	`213`
`214`	`214`	`fn _setitem(&self, needle: &PyObject, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {`
`215`	`215`	`match SequenceIndex::try_from_borrowed_object(vm, needle, "list")? {`
`216`		`- SequenceIndex::Int(index) => self.borrow_vec_mut().set_item_by_index(vm, index, value),`
	`216`	`+ SequenceIndex::Int(index) => self.borrow_vec_mut().setitem_by_index(vm, index, value),`
`217`	`217`	`SequenceIndex::Slice(slice) => {`
`218`	`218`	`let sec = extract_cloned(&*value, Ok, vm)?;`
`219`		`- self.borrow_vec_mut().set_item_by_slice(vm, slice, &sec)`
	`219`	`+ self.borrow_vec_mut().setitem_by_slice(vm, slice, &sec)`
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`	`}`
`@@ -451,7 +451,7 @@ impl AsSequence for PyList {`
`451`	`451`	`ass_item: Some(\|seq, i, value, vm\| {`
`452`	`452`	`let zelf = Self::sequence_downcast(seq);`
`453`	`453`	`if let Some(value) = value {`
`454`		`- zelf.borrow_vec_mut().set_item_by_index(vm, i, value)`
	`454`	`+ zelf.borrow_vec_mut().setitem_by_index(vm, i, value)`
`455`	`455`	`} else {`
`456`	`456`	`zelf.borrow_vec_mut().del_item_by_index(vm, i)`
`457`	`457`	`}`