Skip to content

Commit c97f342

Browse files
author
Rachel Powers
committed
cleanup and rustfmt
1 parent aba059b commit c97f342

2 files changed

Lines changed: 11 additions & 34 deletions

File tree

vm/src/obj/objlist.rs

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use std::ops::DerefMut;
55

66
use num_traits::ToPrimitive;
77

8-
98
use crate::function::{OptionalArg, PyFuncArgs};
109
use crate::pyobject::{IdProtocol, PyContext, PyObjectRef, PyRef, PyResult, PyValue, TypeProtocol};
1110
use crate::vm::{ReprGuard, VirtualMachine};
@@ -14,8 +13,8 @@ use super::objbool;
1413
use super::objint;
1514
use super::objiter;
1615
use super::objsequence::{
17-
get_elements, get_elements_cell, get_item, seq_equal, seq_ge, seq_gt, seq_le, seq_lt, seq_mul,
18-
PySliceableSequence, del_item,
16+
del_item, get_elements, get_elements_cell, get_item, seq_equal, seq_ge, seq_gt, seq_le, seq_lt,
17+
seq_mul, PySliceableSequence,
1918
};
2019
use super::objtype;
2120
use crate::obj::objtype::PyClassRef;
@@ -312,27 +311,7 @@ impl PyListRef {
312311

313312
fn delitem(self, key: PyObjectRef, vm: &VirtualMachine) -> PyResult {
314313
let mut elements = self.elements.borrow_mut();
315-
// if objtype::isinstance(&key, &vm.ctx.int_type()) {
316-
// let idx = objint::get_value(&key).to_i32().unwrap();
317-
// if let Some(_) = elements.get_pos(idx) {
318-
// elements.remove(idx as usize);
319-
// Ok(vm.get_none())
320-
// } else {
321-
// Err(vm.new_index_error("list index out of range".to_string()))
322-
// }
323-
324-
// } else {
325-
// panic!(
326-
// "TypeError: indexing type {:?} with index {:?} is not supported (yet?)",
327-
// elements, key
328-
// )
329-
// }
330-
del_item(
331-
vm,
332-
self.as_object(),
333-
elements.deref_mut(),
334-
key,
335-
)
314+
del_item(vm, self.as_object(), elements.deref_mut(), key)
336315
}
337316
}
338317

vm/src/obj/objsequence.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl<T: Clone> PySliceableSequence for Vec<T> {
137137
}
138138
}
139139

140-
pub trait PySliceableSequenceMut : PySliceableSequence {
140+
pub trait PySliceableSequenceMut: PySliceableSequence {
141141
//fn set_slice<T: PySliceableSequence>(&self, range: Range<usize>, seq: T) -> Self;
142142
//fn set_slice_reverse<T: PySliceableSequence>(&self, range: Range<usize>, seq: T) -> Self;
143143
//fn set_stepped_slice<T: PySliceableSequence>(&self, range: Range<usize>, step: usize, seq: T) -> Self;
@@ -162,15 +162,15 @@ pub trait PySliceableSequenceMut : PySliceableSequence {
162162
Some(1) => {
163163
self.del_slice(range);
164164
Ok(vm.get_none())
165-
},
165+
}
166166
Some(num) => {
167167
self.del_stepped_slice(range, num as usize);
168168
Ok(vm.get_none())
169-
},
169+
}
170170
None => {
171171
self.del_slice(range.start..range.start + 1);
172172
Ok(vm.get_none())
173-
},
173+
}
174174
}
175175
} else {
176176
// TODO what to delete here?
@@ -187,15 +187,15 @@ pub trait PySliceableSequenceMut : PySliceableSequence {
187187
Some(1) => {
188188
self.del_slice(range);
189189
Ok(vm.get_none())
190-
},
190+
}
191191
Some(num) => {
192192
self.del_stepped_slice(range, num as usize);
193193
Ok(vm.get_none())
194-
},
194+
}
195195
None => {
196196
self.del_slice(range.end - 1..range.end);
197197
Ok(vm.get_none())
198-
},
198+
}
199199
}
200200
} else {
201201
// TODO what to del here?
@@ -238,7 +238,6 @@ impl<T: Clone> PySliceableSequenceMut for Vec<T> {
238238
}
239239
}
240240

241-
242241
pub fn get_item(
243242
vm: &VirtualMachine,
244243
sequence: &PyObjectRef,
@@ -285,7 +284,7 @@ pub fn get_item(
285284
}
286285
}
287286

288-
pub fn del_item<T: PySliceableSequenceMut> (
287+
pub fn del_item<T: PySliceableSequenceMut>(
289288
vm: &VirtualMachine,
290289
sequence: &PyObjectRef,
291290
elements: &mut T,
@@ -308,7 +307,6 @@ pub fn del_item<T: PySliceableSequenceMut> (
308307
}
309308

310309
if subscript.payload::<PySlice>().is_some() {
311-
312310
if sequence.payload::<PyList>().is_some() {
313311
elements.del_slice_items(vm, &subscript)
314312
} else {

0 commit comments

Comments
 (0)