Fix ci errors

coolreader18 · coolreader18 · commit b75ba3e19e66 · 2020-05-04T11:43:17.000-05:00
diff --git a/vm/src/import.rs b/vm/src/import.rs
@@ -45,7 +45,7 @@ pub fn init_importlib(vm: &VirtualMachine, initialize_parameter: InitParameter)
                 path_hooks.insert(0, zipimporter);
                 Ok(())
             })();
-            if let Err(_) = zipimport_res {
+            if zipimport_res.is_err() {
                 eprintln!("couldn't init zipimport")
             }
         }
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -620,14 +620,14 @@ mod fileio {
                         vm,
                     )?
                 };
-                (name.clone().into_object(), fd)
+                (name.into_object(), fd)
             }
             Either::B(fno) => (vm.new_int(fno), fno),
         };
 
         vm.set_attr(&file_io, "name", name)?;
         vm.set_attr(&file_io, "__fileno", vm.new_int(file_no))?;
-        vm.set_attr(&file_io, "__closefd", vm.new_bool(args.closefd))?;
+        vm.set_attr(&file_io, "closefd", vm.new_bool(args.closefd))?;
         vm.set_attr(&file_io, "__closed", vm.new_bool(false))?;
         Ok(vm.get_none())
     }
@@ -723,7 +723,7 @@ mod fileio {
     }
 
     fn file_io_close(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
-        let closefd = objbool::boolval(vm, vm.get_attribute(instance.clone(), "__closefd")?)?;
+        let closefd = objbool::boolval(vm, vm.get_attribute(instance.clone(), "closefd")?)?;
         if closefd {
             let raw_handle =
                 i64::try_from_object(vm, vm.get_attribute(instance.clone(), "__fileno")?)?;

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ pub fn init_importlib(vm: &VirtualMachine, initialize_parameter: InitParameter)`
`45`	`45`	`path_hooks.insert(0, zipimporter);`
`46`	`46`	`Ok(())`
`47`	`47`	`})();`
`48`		`- if let Err(_) = zipimport_res {`
	`48`	`+ if zipimport_res.is_err() {`
`49`	`49`	`eprintln!("couldn't init zipimport")`
`50`	`50`	`}`
`51`	`51`	`}`