Skip to content

Commit d263212

Browse files
committed
Fix conflict
1 parent ff05200 commit d263212

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

vm/src/stdlib/array.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ macro_rules! def_array_enum {
233233
Either::B(slice) => self.getitem_by_slice(slice, vm),
234234
}
235235
}
236-
236+
237237
fn setitem_by_slice(&mut self, slice: PySliceRef, items: &ArrayContentType, vm: &VirtualMachine) -> PyResult<()> {
238238
let start = slice.start_index(vm)?;
239239
let stop = slice.stop_index(vm)?;
@@ -338,7 +338,7 @@ macro_rules! def_array_enum {
338338
fn setitem_by_idx(&mut self, i: isize, value: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
339339
let i = self.idx(i, "array assignment", vm)?;
340340
match self {
341-
$(ArrayContentType::$n(v) => { v[i] = TryFromObject::try_from_object(vm, value)? },)*
341+
$(ArrayContentType::$n(v) => { v[i] = $t::try_into_from_object(vm, value)? },)*
342342
}
343343
Ok(())
344344
}

0 commit comments

Comments
 (0)