Skip to content

Commit 67f072d

Browse files
youknowoneyouknowone
authored
Merge pull request RustPython#1749 from youknowone/_vm
Remove `_vm` parameter when it is not required
2 parents 7312e18 + 92cb58b commit 67f072d

58 files changed

Lines changed: 425 additions & 518 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎vm/src/builtins.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ pub fn to_ascii(value: &str) -> String {
8787
ascii
8888
}
8989

90-
fn builtin_bin(x: PyIntRef, _vm: &VirtualMachine) -> String {
90+
fn builtin_bin(x: PyIntRef) -> String {
9191
let x = x.as_bigint();
9292
if x.is_negative() {
9393
format!("-0b{:b}", x.abs())
@@ -343,7 +343,7 @@ fn builtin_hex(number: PyIntRef, vm: &VirtualMachine) -> PyResult {
343343
Ok(vm.new_str(s))
344344
}
345345

346-
fn builtin_id(obj: PyObjectRef, _vm: &VirtualMachine) -> usize {
346+
fn builtin_id(obj: PyObjectRef) -> usize {
347347
obj.get_id()
348348
}
349349

@@ -391,7 +391,7 @@ fn builtin_len(obj: PyObjectRef, vm: &VirtualMachine) -> PyResult<usize> {
391391

392392
fn builtin_locals(vm: &VirtualMachine) -> PyDictRef {
393393
let locals = vm.get_locals();
394-
locals.copy(vm).into_ref(vm)
394+
locals.copy().into_ref(vm)
395395
}
396396

397397
fn builtin_max(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {

‎vm/src/exceptions.rs‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ impl PyBaseException {
6767
Ok(())
6868
}
6969

70-
#[pyproperty(name = "args")]
71-
fn get_args(&self, _vm: &VirtualMachine) -> PyTupleRef {
70+
#[pyproperty]
71+
pub fn args(&self) -> PyTupleRef {
7272
self.args.borrow().clone()
7373
}
7474

@@ -80,7 +80,7 @@ impl PyBaseException {
8080
}
8181

8282
#[pyproperty(name = "__traceback__")]
83-
fn get_traceback(&self) -> Option<PyTracebackRef> {
83+
pub fn traceback(&self) -> Option<PyTracebackRef> {
8484
self.traceback.borrow().clone()
8585
}
8686

@@ -90,51 +90,37 @@ impl PyBaseException {
9090
}
9191

9292
#[pyproperty(name = "__cause__")]
93-
fn get_cause(&self, _vm: &VirtualMachine) -> Option<PyBaseExceptionRef> {
93+
pub fn cause(&self) -> Option<PyBaseExceptionRef> {
9494
self.cause.borrow().clone()
9595
}
9696

9797
#[pyproperty(name = "__cause__", setter)]
98-
fn setter_cause(
99-
&self,
100-
cause: Option<PyBaseExceptionRef>,
101-
_vm: &VirtualMachine,
102-
) -> PyResult<()> {
98+
pub fn set_cause(&self, cause: Option<PyBaseExceptionRef>) {
10399
self.cause.replace(cause);
104-
Ok(())
105100
}
106101

107102
#[pyproperty(name = "__context__")]
108-
fn get_context(&self, _vm: &VirtualMachine) -> Option<PyBaseExceptionRef> {
103+
pub fn context(&self) -> Option<PyBaseExceptionRef> {
109104
self.context.borrow().clone()
110105
}
111106

112107
#[pyproperty(name = "__context__", setter)]
113-
fn setter_context(
114-
&self,
115-
context: Option<PyBaseExceptionRef>,
116-
_vm: &VirtualMachine,
117-
) -> PyResult<()> {
108+
pub fn set_context(&self, context: Option<PyBaseExceptionRef>) {
118109
self.context.replace(context);
119-
Ok(())
120110
}
121111

122112
#[pyproperty(name = "__suppress_context__")]
123-
fn get_suppress_context(&self, _vm: &VirtualMachine) -> bool {
113+
fn get_suppress_context(&self) -> bool {
124114
self.suppress_context.get()
125115
}
126116

127117
#[pyproperty(name = "__suppress_context__", setter)]
128-
fn set_suppress_context(&self, suppress_context: bool, _vm: &VirtualMachine) {
118+
fn set_suppress_context(&self, suppress_context: bool) {
129119
self.suppress_context.set(suppress_context);
130120
}
131121

132122
#[pymethod]
133-
fn with_traceback(
134-
zelf: PyRef<Self>,
135-
tb: Option<PyTracebackRef>,
136-
_vm: &VirtualMachine,
137-
) -> PyResult {
123+
fn with_traceback(zelf: PyRef<Self>, tb: Option<PyTracebackRef>) -> PyResult {
138124
zelf.traceback.replace(tb);
139125
Ok(zelf.as_object().clone())
140126
}
@@ -158,28 +144,6 @@ impl PyBaseException {
158144
Err(i) => format!("{}({})", cls.name, i.format(", ")),
159145
}
160146
}
161-
162-
pub fn args(&self) -> PyTupleRef {
163-
self.args.borrow().clone()
164-
}
165-
166-
pub fn traceback(&self) -> Option<PyTracebackRef> {
167-
self.traceback.borrow().clone()
168-
}
169-
170-
pub fn cause(&self) -> Option<PyBaseExceptionRef> {
171-
self.cause.borrow().clone()
172-
}
173-
pub fn set_cause(&self, cause: Option<PyBaseExceptionRef>) {
174-
self.cause.replace(cause);
175-
}
176-
177-
pub fn context(&self) -> Option<PyBaseExceptionRef> {
178-
self.context.borrow().clone()
179-
}
180-
pub fn set_context(&self, context: Option<PyBaseExceptionRef>) {
181-
self.context.replace(context);
182-
}
183147
}
184148

185149
/// Print exception chain

‎vm/src/frame.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ impl Frame {
337337
bytecode::Instruction::ListAppend { i } => {
338338
let list_obj = self.nth_value(*i);
339339
let item = self.pop_value();
340-
objlist::PyListRef::try_from_object(vm, list_obj)?.append(item, vm);
340+
objlist::PyListRef::try_from_object(vm, list_obj)?.append(item);
341341
Ok(None)
342342
}
343343
bytecode::Instruction::SetAdd { i } => {

‎vm/src/obj/objbool.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub fn get_py_int(obj: &PyObjectRef) -> &PyInt {
118118
&obj.payload::<PyInt>().unwrap()
119119
}
120120

121-
fn bool_repr(obj: bool, _vm: &VirtualMachine) -> String {
121+
fn bool_repr(obj: bool) -> String {
122122
if obj {
123123
"True".to_owned()
124124
} else {

‎vm/src/obj/objbytearray.rs‎

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,17 @@ impl PyByteArray {
9999
}
100100

101101
#[pymethod(name = "__repr__")]
102-
fn repr(&self, _vm: &VirtualMachine) -> PyResult<String> {
102+
fn repr(&self) -> PyResult<String> {
103103
Ok(format!("bytearray(b'{}')", self.inner.borrow().repr()?))
104104
}
105105

106106
#[pymethod(name = "__len__")]
107-
fn len(&self, _vm: &VirtualMachine) -> usize {
107+
fn len(&self) -> usize {
108108
self.inner.borrow().len()
109109
}
110110

111111
#[pymethod(name = "__sizeof__")]
112-
fn sizeof(&self, _vm: &VirtualMachine) -> usize {
112+
fn sizeof(&self) -> usize {
113113
size_of::<Self>() + self.inner.borrow().len() * size_of::<u8>()
114114
}
115115

@@ -144,7 +144,7 @@ impl PyByteArray {
144144
}
145145

146146
#[pymethod(name = "__iter__")]
147-
fn iter(zelf: PyRef<Self>, _vm: &VirtualMachine) -> PyByteArrayIterator {
147+
fn iter(zelf: PyRef<Self>) -> PyByteArrayIterator {
148148
PyByteArrayIterator {
149149
position: Cell::new(0),
150150
bytearray: zelf,
@@ -190,67 +190,67 @@ impl PyByteArray {
190190
}
191191

192192
#[pymethod(name = "isalnum")]
193-
fn isalnum(&self, _vm: &VirtualMachine) -> bool {
193+
fn isalnum(&self) -> bool {
194194
self.inner.borrow().isalnum()
195195
}
196196

197197
#[pymethod(name = "isalpha")]
198-
fn isalpha(&self, _vm: &VirtualMachine) -> bool {
198+
fn isalpha(&self) -> bool {
199199
self.inner.borrow().isalpha()
200200
}
201201

202202
#[pymethod(name = "isascii")]
203-
fn isascii(&self, _vm: &VirtualMachine) -> bool {
203+
fn isascii(&self) -> bool {
204204
self.inner.borrow().isascii()
205205
}
206206

207207
#[pymethod(name = "isdigit")]
208-
fn isdigit(&self, _vm: &VirtualMachine) -> bool {
208+
fn isdigit(&self) -> bool {
209209
self.inner.borrow().isdigit()
210210
}
211211

212212
#[pymethod(name = "islower")]
213-
fn islower(&self, _vm: &VirtualMachine) -> bool {
213+
fn islower(&self) -> bool {
214214
self.inner.borrow().islower()
215215
}
216216

217217
#[pymethod(name = "isspace")]
218-
fn isspace(&self, _vm: &VirtualMachine) -> bool {
218+
fn isspace(&self) -> bool {
219219
self.inner.borrow().isspace()
220220
}
221221

222222
#[pymethod(name = "isupper")]
223-
fn isupper(&self, _vm: &VirtualMachine) -> bool {
223+
fn isupper(&self) -> bool {
224224
self.inner.borrow().isupper()
225225
}
226226

227227
#[pymethod(name = "istitle")]
228-
fn istitle(&self, _vm: &VirtualMachine) -> bool {
228+
fn istitle(&self) -> bool {
229229
self.inner.borrow().istitle()
230230
}
231231

232232
#[pymethod(name = "lower")]
233-
fn lower(&self, _vm: &VirtualMachine) -> PyByteArray {
233+
fn lower(&self) -> PyByteArray {
234234
self.inner.borrow().lower().into()
235235
}
236236

237237
#[pymethod(name = "upper")]
238-
fn upper(&self, _vm: &VirtualMachine) -> PyByteArray {
238+
fn upper(&self) -> PyByteArray {
239239
self.inner.borrow().upper().into()
240240
}
241241

242242
#[pymethod(name = "capitalize")]
243-
fn capitalize(&self, _vm: &VirtualMachine) -> PyByteArray {
243+
fn capitalize(&self) -> PyByteArray {
244244
self.inner.borrow().capitalize().into()
245245
}
246246

247247
#[pymethod(name = "swapcase")]
248-
fn swapcase(&self, _vm: &VirtualMachine) -> PyByteArray {
248+
fn swapcase(&self) -> PyByteArray {
249249
self.inner.borrow().swapcase().into()
250250
}
251251

252252
#[pymethod(name = "hex")]
253-
fn hex(&self, _vm: &VirtualMachine) -> String {
253+
fn hex(&self) -> String {
254254
self.inner.borrow().hex()
255255
}
256256

@@ -375,11 +375,7 @@ impl PyByteArray {
375375
}
376376

377377
#[pymethod(name = "strip")]
378-
fn strip(
379-
&self,
380-
chars: OptionalArg<PyByteInner>,
381-
_vm: &VirtualMachine,
382-
) -> PyResult<PyByteArray> {
378+
fn strip(&self, chars: OptionalArg<PyByteInner>) -> PyResult<PyByteArray> {
383379
Ok(self
384380
.inner
385381
.borrow()
@@ -388,11 +384,7 @@ impl PyByteArray {
388384
}
389385

390386
#[pymethod(name = "lstrip")]
391-
fn lstrip(
392-
&self,
393-
chars: OptionalArg<PyByteInner>,
394-
_vm: &VirtualMachine,
395-
) -> PyResult<PyByteArray> {
387+
fn lstrip(&self, chars: OptionalArg<PyByteInner>) -> PyResult<PyByteArray> {
396388
Ok(self
397389
.inner
398390
.borrow()
@@ -401,11 +393,7 @@ impl PyByteArray {
401393
}
402394

403395
#[pymethod(name = "rstrip")]
404-
fn rstrip(
405-
&self,
406-
chars: OptionalArg<PyByteInner>,
407-
_vm: &VirtualMachine,
408-
) -> PyResult<PyByteArray> {
396+
fn rstrip(&self, chars: OptionalArg<PyByteInner>) -> PyResult<PyByteArray> {
409397
Ok(self
410398
.inner
411399
.borrow()
@@ -460,7 +448,7 @@ impl PyByteArray {
460448
}
461449

462450
#[pymethod(name = "expandtabs")]
463-
fn expandtabs(&self, options: ByteInnerExpandtabsOptions, _vm: &VirtualMachine) -> PyByteArray {
451+
fn expandtabs(&self, options: ByteInnerExpandtabsOptions) -> PyByteArray {
464452
self.inner.borrow().expandtabs(options).into()
465453
}
466454

@@ -477,7 +465,7 @@ impl PyByteArray {
477465
}
478466

479467
#[pymethod(name = "zfill")]
480-
fn zfill(&self, width: PyIntRef, _vm: &VirtualMachine) -> PyByteArray {
468+
fn zfill(&self, width: PyIntRef) -> PyByteArray {
481469
self.inner.borrow().zfill(width).into()
482470
}
483471

@@ -487,18 +475,17 @@ impl PyByteArray {
487475
old: PyByteInner,
488476
new: PyByteInner,
489477
count: OptionalArg<PyIntRef>,
490-
_vm: &VirtualMachine,
491478
) -> PyResult<PyByteArray> {
492479
Ok(self.inner.borrow().replace(old, new, count)?.into())
493480
}
494481

495482
#[pymethod(name = "clear")]
496-
fn clear(&self, _vm: &VirtualMachine) {
483+
fn clear(&self) {
497484
self.inner.borrow_mut().elements.clear();
498485
}
499486

500487
#[pymethod(name = "copy")]
501-
fn copy(&self, _vm: &VirtualMachine) -> PyByteArray {
488+
fn copy(&self) -> PyByteArray {
502489
self.inner.borrow().elements.clone().into()
503490
}
504491

@@ -560,22 +547,22 @@ impl PyByteArray {
560547
}
561548

562549
#[pymethod(name = "title")]
563-
fn title(&self, _vm: &VirtualMachine) -> PyByteArray {
550+
fn title(&self) -> PyByteArray {
564551
self.inner.borrow().title().into()
565552
}
566553

567554
#[pymethod(name = "__mul__")]
568-
fn repeat(&self, n: isize, _vm: &VirtualMachine) -> PyByteArray {
555+
fn repeat(&self, n: isize) -> PyByteArray {
569556
self.inner.borrow().repeat(n).into()
570557
}
571558

572559
#[pymethod(name = "__rmul__")]
573-
fn rmul(&self, n: isize, vm: &VirtualMachine) -> PyByteArray {
574-
self.repeat(n, vm)
560+
fn rmul(&self, n: isize) -> PyByteArray {
561+
self.repeat(n)
575562
}
576563

577564
#[pymethod(name = "__imul__")]
578-
fn irepeat(&self, n: isize, _vm: &VirtualMachine) {
565+
fn irepeat(&self, n: isize) {
579566
self.inner.borrow_mut().irepeat(n)
580567
}
581568

@@ -603,7 +590,7 @@ impl PyByteArray {
603590
}
604591

605592
#[pymethod(name = "reverse")]
606-
fn reverse(&self, _vm: &VirtualMachine) -> PyResult<()> {
593+
fn reverse(&self) -> PyResult<()> {
607594
self.inner.borrow_mut().elements.reverse();
608595
Ok(())
609596
}
@@ -640,7 +627,7 @@ impl PyByteArrayIterator {
640627
}
641628

642629
#[pymethod(name = "__iter__")]
643-
fn iter(zelf: PyRef<Self>, _vm: &VirtualMachine) -> PyRef<Self> {
630+
fn iter(zelf: PyRef<Self>) -> PyRef<Self> {
644631
zelf
645632
}
646633
}

0 commit comments

Comments
 (0)