Replace new_tuple(vec![]) with empty_tuple()

coolreader18 · coolreader18 · commit 9f3a26ea4445 · 2019-07-25T02:32:23.000-04:00
diff --git a/src/main.rs b/src/main.rs
@@ -318,7 +318,7 @@ fn run_command(vm: &VirtualMachine, source: String) -> PyResult<()> {
 
 fn run_module(vm: &VirtualMachine, module: &str) -> PyResult<()> {
     debug!("Running module {}", module);
-    vm.import(module, &vm.ctx.new_tuple(vec![]), 0)?;
+    vm.import(module, &vm.ctx.empty_tuple, 0)?;
     Ok(())
 }
 
diff --git a/vm/src/frame.rs b/vm/src/frame.rs
@@ -725,7 +725,7 @@ impl Frame {
         level: usize,
     ) -> FrameResult {
         let module = module.clone().unwrap_or_default();
-        let module = vm.import(&module, &vm.ctx.new_tuple(vec![]), level)?;
+        let module = vm.import(&module, &vm.ctx.empty_tuple, level)?;
 
         // Grab all the names from the module and put them in the context
         if let Some(dict) = &module.dict {
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -27,7 +27,7 @@ pub fn init_importlib(vm: &VirtualMachine, external: bool) -> PyResult {
         vm.invoke(install_external, vec![])?;
         // Set pyc magic number to commit hash. Should be changed when bytecode will be more stable.
         let importlib_external =
-            vm.import("_frozen_importlib_external", &vm.ctx.new_tuple(vec![]), 0)?;
+            vm.import("_frozen_importlib_external", &vm.ctx.empty_tuple, 0)?;
         let mut magic = get_git_revision().into_bytes();
         magic.truncate(4);
         if magic.len() != 4 {
diff --git a/vm/src/stdlib/ast.rs b/vm/src/stdlib/ast.rs
@@ -42,7 +42,7 @@ macro_rules! node {
     ( $vm: expr, $node_name:ident) => {
         {
         let node = create_node($vm, stringify!($node_name))?;
-        $vm.set_attr(node.as_object(), "_fields", $vm.ctx.new_tuple(vec![]))?;
+        $vm.set_attr(node.as_object(), "_fields", $vm.ctx.empty_tuple())?;
         node
         }
     }
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -601,7 +601,7 @@ pub fn io_open(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
         }
     };
 
-    let io_module = vm.import("_io", &vm.ctx.new_tuple(vec![]), 0)?;
+    let io_module = vm.import("_io", &vm.ctx.empty_tuple, 0)?;
 
     // Construct a FileIO (subclass of RawIOBase)
     // This is subsequently consumed by a Buffered Class.
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -217,15 +217,15 @@ impl VirtualMachine {
 
     pub fn try_class(&self, module: &str, class: &str) -> PyResult<PyClassRef> {
         let class = self
-            .get_attribute(self.import(module, &self.ctx.new_tuple(vec![]), 0)?, class)?
+            .get_attribute(self.import(module, &self.ctx.empty_tuple, 0)?, class)?
             .downcast()
             .expect("not a class");
         Ok(class)
     }
 
     pub fn class(&self, module: &str, class: &str) -> PyClassRef {
         let module = self
-            .import(module, &self.ctx.new_tuple(vec![]), 0)
+            .import(module, &self.ctx.empty_tuple, 0)
             .unwrap_or_else(|_| panic!("unable to import {}", module));
         let class = self
             .get_attribute(module.clone(), class)

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ fn run_command(vm: &VirtualMachine, source: String) -> PyResult<()> {`
`318`	`318`
`319`	`319`	`fn run_module(vm: &VirtualMachine, module: &str) -> PyResult<()> {`
`320`	`320`	`debug!("Running module {}", module);`
`321`		`- vm.import(module, &vm.ctx.new_tuple(vec![]), 0)?;`
	`321`	`+ vm.import(module, &vm.ctx.empty_tuple, 0)?;`
`322`	`322`	`Ok(())`
`323`	`323`	`}`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ macro_rules! node {`
`42`	`42`	`( $vm: expr, $node_name:ident) => {`
`43`	`43`	`{`
`44`	`44`	`let node = create_node($vm, stringify!($node_name))?;`
`45`		`- $vm.set_attr(node.as_object(), "_fields", $vm.ctx.new_tuple(vec![]))?;`
	`45`	`+ $vm.set_attr(node.as_object(), "_fields", $vm.ctx.empty_tuple())?;`
`46`	`46`	`node`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ pub fn io_open(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {`
`601`	`601`	`}`
`602`	`602`	`};`
`603`	`603`
`604`		`- let io_module = vm.import("_io", &vm.ctx.new_tuple(vec![]), 0)?;`
	`604`	`+ let io_module = vm.import("_io", &vm.ctx.empty_tuple, 0)?;`
`605`	`605`
`606`	`606`	`// Construct a FileIO (subclass of RawIOBase)`
`607`	`607`	`// This is subsequently consumed by a Buffered Class.`