Fix further issues.

DimitrisJim · DimitrisJim · commit 5acb66cffe93 · 2023-01-31T00:05:01.000+02:00
diff --git a/vm/build.rs b/vm/build.rs
@@ -5,7 +5,7 @@ fn main() {
     #[cfg(feature = "freeze-stdlib")]
     for entry in glob::glob("Lib/*/*.py").expect("Lib/ exists?").flatten() {
         let display = entry.display();
-        println!("cargo:rerun-if-changed={}", display);
+        println!("cargo:rerun-if-changed={display}");
     }
 
     println!("cargo:rustc-env=RUSTPYTHON_GIT_HASH={}", git_hash());
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -1673,7 +1673,7 @@ pub(super) mod _os {
                 Err(vm.new_value_error(format!("Invalid wait status: {status}")))
             } else {
                 i32::try_from(status.rotate_right(8))
-                    .map_err(|_| vm.new_value_error(format!("invalid wait status: {}", status)))
+                    .map_err(|_| vm.new_value_error(format!("invalid wait status: {status}")))
             }
         }
     }
@@ -1694,7 +1694,7 @@ pub(super) mod _os {
                     _ => 0,
                 };
 
-                Ok(Some(format!("cp{}", cp)))
+                Ok(Some(format!("cp{cp}")))
             } else {
                 let encoding = unsafe {
                     let encoding = libc::nl_langinfo(libc::CODESET);
diff --git a/wasm/lib/src/convert.rs b/wasm/lib/src/convert.rs
@@ -72,7 +72,7 @@ pub fn js_err_to_py_err(vm: &VirtualMachine, js_err: &JsValue) -> PyBaseExceptio
         }
         None => vm.new_exception_msg(
             vm.ctx.exceptions.exception_type.to_owned(),
-            format!("{:?}", js_err),
+            format!("{js_err:?}"),
         ),
     }
 }
@@ -246,7 +246,7 @@ pub fn js_to_py(vm: &VirtualMachine, js_val: JsValue) -> PyObjectRef {
 }
 
 pub fn syntax_err(err: CompileError) -> SyntaxError {
-    let js_err = SyntaxError::new(&format!("Error parsing Python code: {}", err));
+    let js_err = SyntaxError::new(&format!("Error parsing Python code: {err}"));
     let _ = Reflect::set(&js_err, &"row".into(), &(err.location.row() as u32).into());
     let _ = Reflect::set(
         &js_err,
diff --git a/wasm/lib/src/js_module.rs b/wasm/lib/src/js_module.rs
@@ -160,7 +160,7 @@ mod _js {
                     .map(PyJsValue::new)
                     .map_err(|err| new_js_error(vm, err))
             } else {
-                Err(vm.new_attribute_error(format!("No attribute {:?} on JS value", name)))
+                Err(vm.new_attribute_error(format!("No attribute {name:?} on JS value")))
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ fn main() {`
`5`	`5`	`#[cfg(feature = "freeze-stdlib")]`
`6`	`6`	`for entry in glob::glob("Lib//.py").expect("Lib/ exists?").flatten() {`
`7`	`7`	`let display = entry.display();`
`8`		`- println!("cargo:rerun-if-changed={}", display);`
	`8`	`+ println!("cargo:rerun-if-changed={display}");`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`println!("cargo:rustc-env=RUSTPYTHON_GIT_HASH={}", git_hash());`
Original file line number	Diff line number	Diff line change
`@@ -1673,7 +1673,7 @@ pub(super) mod _os {`
`1673`	`1673`	`Err(vm.new_value_error(format!("Invalid wait status: {status}")))`
`1674`	`1674`	`} else {`
`1675`	`1675`	`i32::try_from(status.rotate_right(8))`
`1676`		`- .map_err(\|_\| vm.new_value_error(format!("invalid wait status: {}", status)))`
	`1676`	`+ .map_err(\|_\| vm.new_value_error(format!("invalid wait status: {status}")))`
`1677`	`1677`	`}`
`1678`	`1678`	`}`
`1679`	`1679`	`}`
`@@ -1694,7 +1694,7 @@ pub(super) mod _os {`
`1694`	`1694`	`_ => 0,`
`1695`	`1695`	`};`
`1696`	`1696`
`1697`		`- Ok(Some(format!("cp{}", cp)))`
	`1697`	`+ Ok(Some(format!("cp{cp}")))`
`1698`	`1698`	`} else {`
`1699`	`1699`	`let encoding = unsafe {`
`1700`	`1700`	`let encoding = libc::nl_langinfo(libc::CODESET);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ pub fn js_err_to_py_err(vm: &VirtualMachine, js_err: &JsValue) -> PyBaseExceptio`
`72`	`72`	`}`
`73`	`73`	`None => vm.new_exception_msg(`
`74`	`74`	`vm.ctx.exceptions.exception_type.to_owned(),`
`75`		`- format!("{:?}", js_err),`
	`75`	`+ format!("{js_err:?}"),`
`76`	`76`	`),`
`77`	`77`	`}`
`78`	`78`	`}`
`@@ -246,7 +246,7 @@ pub fn js_to_py(vm: &VirtualMachine, js_val: JsValue) -> PyObjectRef {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`pub fn syntax_err(err: CompileError) -> SyntaxError {`
`249`		`- let js_err = SyntaxError::new(&format!("Error parsing Python code: {}", err));`
	`249`	`+ let js_err = SyntaxError::new(&format!("Error parsing Python code: {err}"));`
`250`	`250`	`let _ = Reflect::set(&js_err, &"row".into(), &(err.location.row() as u32).into());`
`251`	`251`	`let _ = Reflect::set(`
`252`	`252`	`&js_err,`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ mod _js {`
`160`	`160`	`.map(PyJsValue::new)`
`161`	`161`	`.map_err(\|err\| new_js_error(vm, err))`
`162`	`162`	`} else {`
`163`		`- Err(vm.new_attribute_error(format!("No attribute {:?} on JS value", name)))`
	`163`	`+ Err(vm.new_attribute_error(format!("No attribute {name:?} on JS value")))`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`