Skip to content

Fix clippy issues for rust 1.67 #4478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 2 commits into from
Jan 31, 2023
Merged

Fix clippy issues for rust 1.67 #4478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4b9ad8
Fix clippy issues for rust 1.67
DimitrisJim Jan 30, 2023
5acb66c
Fix further issues.
DimitrisJim Jan 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix clippy issues for rust 1.67
  • Loading branch information
@DimitrisJim
DimitrisJim committed Jan 30, 2023
commit d4b9ad863ff318e86c0972262afb206f30af430c
11 changes: 5 additions & 6 deletions stdlib/src/sqlite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
)
}
}
Expand Down Expand Up @@ -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"),
)
}
}
Expand Down Expand Up @@ -1739,8 +1739,7 @@ mod _sqlite {
}
_ => {
return Err(vm.new_not_implemented_error(format!(
"unknown column type: {}",
col_type
"unknown column type: {col_type}"
)));
}
}
Expand Down
2 changes: 1 addition & 1 deletion vm/src/builtins/function/jitfunc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
))
}
Expand Down
11 changes: 4 additions & 7 deletions vm/src/format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand All @@ -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)
}
}
Expand Down
7 changes: 2 additions & 5 deletions vm/src/stdlib/posix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down Expand Up @@ -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(
Expand Down