From 46518e87020db3606eb41cc3d7ab2a074256d681 Mon Sep 17 00:00:00 2001 From: Youngchan Lee Date: Sat, 5 Sep 2020 14:04:46 +0900 Subject: [PATCH] .into_ref(vm).into_object() -> .into_object(vm) --- vm/src/builtins.rs | 2 +- vm/src/frame.rs | 2 +- vm/src/obj/objtype.rs | 4 ++-- vm/src/stdlib/csv.rs | 2 +- vm/src/stdlib/itertools.rs | 4 ++-- vm/src/stdlib/re.rs | 2 +- vm/src/stdlib/symtable.rs | 4 ++-- wasm/lib/src/browser_module.rs | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs index 27bbecb48d..1308788d35 100644 --- a/vm/src/builtins.rs +++ b/vm/src/builtins.rs @@ -705,7 +705,7 @@ mod decl { let len = vm.call_method(&obj, "__len__", PyFuncArgs::default())?; let len = objint::get_value(&len).to_isize().unwrap(); let obj_iterator = objiter::PySequenceIterator::new_reversed(obj, len); - Ok(obj_iterator.into_ref(vm).into_object()) + Ok(obj_iterator.into_object(vm)) } } diff --git a/vm/src/frame.rs b/vm/src/frame.rs index 70e2bc3483..d90e59318e 100644 --- a/vm/src/frame.rs +++ b/vm/src/frame.rs @@ -453,7 +453,7 @@ impl ExecutingFrame<'_> { bytecode::Instruction::YieldValue => { let value = self.pop_value(); let value = if self.code.flags.contains(bytecode::CodeFlags::IS_COROUTINE) { - PyAsyncGenWrappedValue(value).into_ref(vm).into_object() + PyAsyncGenWrappedValue(value).into_object(vm) } else { value }; diff --git a/vm/src/obj/objtype.rs b/vm/src/obj/objtype.rs index 70b618a449..56e73c733e 100644 --- a/vm/src/obj/objtype.rs +++ b/vm/src/obj/objtype.rs @@ -341,13 +341,13 @@ impl PyClassRef { let mut attributes = dict.to_attributes(); if let Some(f) = attributes.get_mut("__new__") { if f.class().is(&vm.ctx.types.function_type) { - *f = PyStaticMethod::from(f.clone()).into_ref(vm).into_object(); + *f = PyStaticMethod::from(f.clone()).into_object(vm); } } if let Some(f) = attributes.get_mut("__init_subclass__") { if f.class().is(&vm.ctx.types.function_type) { - *f = PyClassMethod::from(f.clone()).into_ref(vm).into_object(); + *f = PyClassMethod::from(f.clone()).into_object(vm); } } diff --git a/vm/src/stdlib/csv.rs b/vm/src/stdlib/csv.rs index 862a3f8d8b..a972548cb0 100644 --- a/vm/src/stdlib/csv.rs +++ b/vm/src/stdlib/csv.rs @@ -69,7 +69,7 @@ pub fn build_reader( ) -> PyResult { let config = ReaderOption::new(args, vm)?; - Ok(Reader::new(iterable, config).into_ref(vm).into_pyobject(vm)) + Ok(Reader::new(iterable, config).into_object(vm)) } fn into_strings(iterable: &PyIterable, vm: &VirtualMachine) -> PyResult> { diff --git a/vm/src/stdlib/itertools.rs b/vm/src/stdlib/itertools.rs index 4c45a006c5..4645ace4ab 100644 --- a/vm/src/stdlib/itertools.rs +++ b/vm/src/stdlib/itertools.rs @@ -1115,7 +1115,7 @@ mod decl { self.update_idxs(idxs); - Ok(res.into_ref(vm).into_object()) + Ok(res.into_object(vm)) } fn update_idxs(&self, mut idxs: PyRwLockWriteGuard<'_, Vec>) { @@ -1243,7 +1243,7 @@ mod decl { } } - Ok(res.into_ref(vm).into_object()) + Ok(res.into_object(vm)) } } diff --git a/vm/src/stdlib/re.rs b/vm/src/stdlib/re.rs index 94e670382c..42cddf2446 100644 --- a/vm/src/stdlib/re.rs +++ b/vm/src/stdlib/re.rs @@ -291,7 +291,7 @@ fn create_match(vm: &VirtualMachine, haystack: PyStringRef, captures: Captures) .iter() .map(|opt| opt.map(|m| m.start()..m.end())) .collect(); - PyMatch { haystack, captures }.into_ref(vm).into_object() + PyMatch { haystack, captures }.into_object(vm) } fn extract_flags(flags: OptionalArg) -> PyRegexFlags { diff --git a/vm/src/stdlib/symtable.rs b/vm/src/stdlib/symtable.rs index fe5fa13161..92bcd595b4 100644 --- a/vm/src/stdlib/symtable.rs +++ b/vm/src/stdlib/symtable.rs @@ -171,7 +171,7 @@ mod decl { .symtable .sub_tables .iter() - .map(|t| to_py_symbol_table(t.clone()).into_ref(vm).into_object()) + .map(|t| to_py_symbol_table(t.clone()).into_object(vm)) .collect(); Ok(vm.ctx.new_list(children)) } @@ -267,7 +267,7 @@ mod decl { let namespaces = self .namespaces .iter() - .map(|table| to_py_symbol_table(table.clone()).into_ref(vm).into_object()) + .map(|table| to_py_symbol_table(table.clone()).into_object(vm)) .collect(); Ok(vm.ctx.new_list(namespaces)) } diff --git a/wasm/lib/src/browser_module.rs b/wasm/lib/src/browser_module.rs index cb95bde7d8..db9947f46d 100644 --- a/wasm/lib/src/browser_module.rs +++ b/wasm/lib/src/browser_module.rs @@ -109,7 +109,7 @@ fn browser_fetch(url: PyStringRef, args: FetchArgs, vm: &VirtualMachine) -> PyRe JsFuture::from(response_format.get_response(&response)?).await }; - Ok(PyPromise::from_future(future).into_ref(vm).into_object()) + Ok(PyPromise::from_future(future).into_object(vm)) } fn browser_request_animation_frame(func: PyCallable, vm: &VirtualMachine) -> PyResult { @@ -264,7 +264,7 @@ impl Document { .query_selector(query.borrow_value()) .map_err(|err| convert::js_py_typeerror(vm, err))?; let elem = match elem { - Some(elem) => Element { elem }.into_ref(vm).into_object(), + Some(elem) => Element { elem }.into_object(vm), None => vm.get_none(), }; Ok(elem) @@ -336,7 +336,7 @@ fn browser_load_module(module: PyStringRef, path: PyStringRef, vm: &VirtualMachi } }; - Ok(PyPromise::from_future(future).into_ref(vm).into_object()) + Ok(PyPromise::from_future(future).into_object(vm)) } pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {