Fix clippy issues for rust 1.67 (RustPython#4478)

DimitrisJim · web-flow · commit e1ab8a9b42d2 · 2023-01-31T09:46:19.000+09:00
diff --git a/stdlib/src/sqlite.rs b/stdlib/src/sqlite.rs
@@ -557,13 +557,13 @@ mod _sqlite {
                     context.result_exception(
                         vm,
                         exc,
-                        &format!("user-defined aggregate's '{}' method not defined\0", name),
+                        &format!("user-defined aggregate's '{name}' method not defined\0"),
                     )
                 } else {
                     context.result_exception(
                         vm,
                         exc,
-                        &format!("user-defined aggregate's '{}' method raised error\0", name),
+                        &format!("user-defined aggregate's '{name}' method raised error\0"),
                     )
                 }
             }
@@ -591,13 +591,13 @@ mod _sqlite {
                     context.result_exception(
                         vm,
                         exc,
-                        &format!("user-defined aggregate's '{}' method not defined\0", name),
+                        &format!("user-defined aggregate's '{name}' method not defined\0"),
                     )
                 } else {
                     context.result_exception(
                         vm,
                         exc,
-                        &format!("user-defined aggregate's '{}' method raised error\0", name),
+                        &format!("user-defined aggregate's '{name}' method raised error\0"),
                     )
                 }
             }
@@ -1739,8 +1739,7 @@ mod _sqlite {
                         }
                         _ => {
                             return Err(vm.new_not_implemented_error(format!(
-                                "unknown column type: {}",
-                                col_type
+                                "unknown column type: {col_type}"
                             )));
                         }
                     }
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/builtins/function/jitfunc.rs b/vm/src/builtins/function/jitfunc.rs
@@ -58,7 +58,7 @@ fn get_jit_arg_type(dict: &PyDictRef, name: &str, vm: &VirtualMachine) -> PyResu
         }
     } else {
         Err(new_jit_error(
-            format!("argument {} needs annotation", name),
+            format!("argument {name} needs annotation"),
             vm,
         ))
     }
diff --git a/vm/src/format.rs b/vm/src/format.rs
@@ -18,18 +18,18 @@ impl IntoPyException for FormatSpecError {
                 vm.new_value_error("Invalid format specifier".to_owned())
             }
             FormatSpecError::UnspecifiedFormat(c1, c2) => {
-                let msg = format!("Cannot specify '{}' with '{}'.", c1, c2);
+                let msg = format!("Cannot specify '{c1}' with '{c2}'.");
                 vm.new_value_error(msg)
             }
             FormatSpecError::UnknownFormatCode(c, s) => {
-                let msg = format!("Unknown format code '{}' for object of type '{}'", c, s);
+                let msg = format!("Unknown format code '{c}' for object of type '{s}'");
                 vm.new_value_error(msg)
             }
             FormatSpecError::PrecisionNotAllowed => {
                 vm.new_value_error("Precision not allowed in integer format specifier".to_owned())
             }
             FormatSpecError::NotAllowed(s) => {
-                let msg = format!("{} not allowed with integer format specifier 'c'", s);
+                let msg = format!("{s} not allowed with integer format specifier 'c'");
                 vm.new_value_error(msg)
             }
             FormatSpecError::UnableToConvert => {
@@ -39,10 +39,7 @@ impl IntoPyException for FormatSpecError {
                 vm.new_overflow_error("%c arg not in range(0x110000)".to_owned())
             }
             FormatSpecError::NotImplemented(c, s) => {
-                let msg = format!(
-                    "Format code '{}' for object of type '{}' not implemented yet",
-                    c, s
-                );
+                let msg = format!("Format code '{c}' for object of type '{s}' not implemented yet");
                 vm.new_value_error(msg)
             }
         }
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/vm/src/stdlib/posix.rs b/vm/src/stdlib/posix.rs
@@ -571,10 +571,7 @@ pub mod module {
             let priority_type = priority_class.name();
             let priority = self.sched_priority.clone();
             let value = priority.downcast::<PyInt>().map_err(|_| {
-                vm.new_type_error(format!(
-                    "an integer is required (got type {})",
-                    priority_type
-                ))
+                vm.new_type_error(format!("an integer is required (got type {priority_type})"))
             })?;
             let sched_priority = value.try_to_primitive(vm)?;
             Ok(libc::sched_param { sched_priority })
@@ -1991,7 +1988,7 @@ pub mod module {
     #[pyfunction]
     fn getrandom(size: isize, flags: OptionalArg<u32>, vm: &VirtualMachine) -> PyResult<Vec<u8>> {
         let size = usize::try_from(size)
-            .map_err(|_| vm.new_os_error(format!("Invalid argument for size: {}", size)))?;
+            .map_err(|_| vm.new_os_error(format!("Invalid argument for size: {size}")))?;
         let mut buf = Vec::with_capacity(size);
         unsafe {
             let len = sys_getrandom(
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
`@@ -557,13 +557,13 @@ mod _sqlite {`
`557`	`557`	`context.result_exception(`
`558`	`558`	`vm,`
`559`	`559`	`exc,`
`560`		`- &format!("user-defined aggregate's '{}' method not defined\0", name),`
	`560`	`+ &format!("user-defined aggregate's '{name}' method not defined\0"),`
`561`	`561`	`)`
`562`	`562`	`} else {`
`563`	`563`	`context.result_exception(`
`564`	`564`	`vm,`
`565`	`565`	`exc,`
`566`		`- &format!("user-defined aggregate's '{}' method raised error\0", name),`
	`566`	`+ &format!("user-defined aggregate's '{name}' method raised error\0"),`
`567`	`567`	`)`
`568`	`568`	`}`
`569`	`569`	`}`
`@@ -591,13 +591,13 @@ mod _sqlite {`
`591`	`591`	`context.result_exception(`
`592`	`592`	`vm,`
`593`	`593`	`exc,`
`594`		`- &format!("user-defined aggregate's '{}' method not defined\0", name),`
	`594`	`+ &format!("user-defined aggregate's '{name}' method not defined\0"),`
`595`	`595`	`)`
`596`	`596`	`} else {`
`597`	`597`	`context.result_exception(`
`598`	`598`	`vm,`
`599`	`599`	`exc,`
`600`		`- &format!("user-defined aggregate's '{}' method raised error\0", name),`
	`600`	`+ &format!("user-defined aggregate's '{name}' method raised error\0"),`
`601`	`601`	`)`
`602`	`602`	`}`
`603`	`603`	`}`
`@@ -1739,8 +1739,7 @@ mod _sqlite {`
`1739`	`1739`	`}`
`1740`	`1740`	`_ => {`
`1741`	`1741`	`return Err(vm.new_not_implemented_error(format!(`
`1742`		`- "unknown column type: {}",`
`1743`		`- col_type`
	`1742`	`+ "unknown column type: {col_type}"`
`1744`	`1743`	`)));`
`1745`	`1744`	`}`
`1746`	`1745`	`}`
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
`@@ -58,7 +58,7 @@ fn get_jit_arg_type(dict: &PyDictRef, name: &str, vm: &VirtualMachine) -> PyResu`
`58`	`58`	`}`
`59`	`59`	`} else {`
`60`	`60`	`Err(new_jit_error(`
`61`		`- format!("argument {} needs annotation", name),`
	`61`	`+ format!("argument {name} needs annotation"),`
`62`	`62`	`vm,`
`63`	`63`	`))`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,18 +18,18 @@ impl IntoPyException for FormatSpecError {`
`18`	`18`	`vm.new_value_error("Invalid format specifier".to_owned())`
`19`	`19`	`}`
`20`	`20`	`FormatSpecError::UnspecifiedFormat(c1, c2) => {`
`21`		`- let msg = format!("Cannot specify '{}' with '{}'.", c1, c2);`
	`21`	`+ let msg = format!("Cannot specify '{c1}' with '{c2}'.");`
`22`	`22`	`vm.new_value_error(msg)`
`23`	`23`	`}`
`24`	`24`	`FormatSpecError::UnknownFormatCode(c, s) => {`
`25`		`- let msg = format!("Unknown format code '{}' for object of type '{}'", c, s);`
	`25`	`+ let msg = format!("Unknown format code '{c}' for object of type '{s}'");`
`26`	`26`	`vm.new_value_error(msg)`
`27`	`27`	`}`
`28`	`28`	`FormatSpecError::PrecisionNotAllowed => {`
`29`	`29`	`vm.new_value_error("Precision not allowed in integer format specifier".to_owned())`
`30`	`30`	`}`
`31`	`31`	`FormatSpecError::NotAllowed(s) => {`
`32`		`- let msg = format!("{} not allowed with integer format specifier 'c'", s);`
	`32`	`+ let msg = format!("{s} not allowed with integer format specifier 'c'");`
`33`	`33`	`vm.new_value_error(msg)`
`34`	`34`	`}`
`35`	`35`	`FormatSpecError::UnableToConvert => {`
`@@ -39,10 +39,7 @@ impl IntoPyException for FormatSpecError {`
`39`	`39`	`vm.new_overflow_error("%c arg not in range(0x110000)".to_owned())`
`40`	`40`	`}`
`41`	`41`	`FormatSpecError::NotImplemented(c, s) => {`
`42`		`- let msg = format!(`
`43`		`- "Format code '{}' for object of type '{}' not implemented yet",`
`44`		`- c, s`
`45`		`- );`
	`42`	`+ let msg = format!("Format code '{c}' for object of type '{s}' not implemented yet");`
`46`	`43`	`vm.new_value_error(msg)`
`47`	`44`	`}`
`48`	`45`	`}`
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`