misc: Fix beta clippy issues
Fixing the following clippy issue using `cargo clippy --fix`:
error: variables can be used directly in the `format!` string
--> build.rs:25:27
|
25 | version.push_str(&format!("-{}", extra_version));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args
Signed-off-by: Bo Chen <bchen@crusoe.ai>
This commit is contained in:
Bo Chen
Jinank Jain
parent
8f402687ce
commit
10ee003d66
10 changed files with 67 additions and 74 deletions
|
|
@ -586,15 +586,14 @@ fn create_memory_node(
|
|||
&& (first_region_end <= &mem_32bit_reserved_start))
|
||||
{
|
||||
panic!(
|
||||
"Unexpected first memory region layout: (start: 0x{:08x}, end: 0x{:08x}).
|
||||
ram_start: 0x{:08x}, mem_32bit_reserved_start: 0x{:08x}",
|
||||
first_region_start, first_region_end, ram_start, mem_32bit_reserved_start
|
||||
"Unexpected first memory region layout: (start: 0x{first_region_start:08x}, end: 0x{first_region_end:08x}).
|
||||
ram_start: 0x{ram_start:08x}, mem_32bit_reserved_start: 0x{mem_32bit_reserved_start:08x}"
|
||||
);
|
||||
}
|
||||
|
||||
let mem_size = first_region_end - ram_start;
|
||||
let mem_reg_prop = [ram_start, mem_size];
|
||||
let memory_node_name = format!("memory@{:x}", ram_start);
|
||||
let memory_node_name = format!("memory@{ram_start:x}");
|
||||
let memory_node = fdt.begin_node(&memory_node_name)?;
|
||||
fdt.property_string("device_type", "memory")?;
|
||||
fdt.property_array_u64("reg", &mem_reg_prop)?;
|
||||
|
|
@ -607,14 +606,13 @@ fn create_memory_node(
|
|||
|
||||
if second_region_start != &ram_64bit_start {
|
||||
panic!(
|
||||
"Unexpected second memory region layout: start: 0x{:08x}, ram_64bit_start: 0x{:08x}",
|
||||
second_region_start, ram_64bit_start
|
||||
"Unexpected second memory region layout: start: 0x{second_region_start:08x}, ram_64bit_start: 0x{ram_64bit_start:08x}"
|
||||
);
|
||||
}
|
||||
|
||||
let mem_size = second_region_end - ram_64bit_start;
|
||||
let mem_reg_prop = [ram_64bit_start, mem_size];
|
||||
let memory_node_name = format!("memory@{:x}", ram_64bit_start);
|
||||
let memory_node_name = format!("memory@{ram_64bit_start:x}");
|
||||
let memory_node = fdt.begin_node(&memory_node_name)?;
|
||||
fdt.property_string("device_type", "memory")?;
|
||||
fdt.property_array_u64("reg", &mem_reg_prop)?;
|
||||
|
|
|
|||
|
|
@ -378,7 +378,7 @@ impl QcowHeader {
|
|||
}
|
||||
|
||||
if let Some(backing_file_path) = self.backing_file_path.as_ref() {
|
||||
write!(file, "{}", backing_file_path).map_err(Error::WritingHeader)?;
|
||||
write!(file, "{backing_file_path}").map_err(Error::WritingHeader)?;
|
||||
}
|
||||
|
||||
// Set the file length by seeking and writing a zero to the last byte. This avoids needing
|
||||
|
|
|
|||
2
build.rs
2
build.rs
|
|
@ -22,7 +22,7 @@ fn main() {
|
|||
// Append CH_EXTRA_VERSION to version if it is set.
|
||||
if let Ok(extra_version) = env::var("CH_EXTRA_VERSION") {
|
||||
println!("cargo:rerun-if-env-changed=CH_EXTRA_VERSION");
|
||||
version.push_str(&format!("-{}", extra_version));
|
||||
version.push_str(&format!("-{extra_version}"));
|
||||
}
|
||||
|
||||
// This println!() has a special behavior, as it will set the environment
|
||||
|
|
|
|||
|
|
@ -484,7 +484,7 @@ impl PvmemcontrolBusDevice {
|
|||
}
|
||||
|
||||
fn set_vma_anon_name(&self, addr: u64, length: u64, name: u64) -> result::Result<(), Error> {
|
||||
let name = (name != 0).then(|| CString::new(format!("pvmemcontrol-{}", name)).unwrap());
|
||||
let name = (name != 0).then(|| CString::new(format!("pvmemcontrol-{name}")).unwrap());
|
||||
let name_ptr = if let Some(name) = &name {
|
||||
name.as_ptr()
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -467,7 +467,7 @@ impl hypervisor::Hypervisor for MshvHypervisor {
|
|||
match host_ipa {
|
||||
Ok(ipa) => ipa.try_into().unwrap(),
|
||||
Err(e) => {
|
||||
panic!("Failed to get host IPA limit: {:?}", e);
|
||||
panic!("Failed to get host IPA limit: {e:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1065,8 +1065,7 @@ impl cpu::Vcpu for MshvVcpu {
|
|||
}
|
||||
_ => {
|
||||
panic!(
|
||||
"SVM_EXITCODE_HV_DOORBELL_PAGE: Unhandled exit code: {:0x}",
|
||||
exit_info1
|
||||
"SVM_EXITCODE_HV_DOORBELL_PAGE: Unhandled exit code: {exit_info1:0x}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -1226,13 +1225,12 @@ impl cpu::Vcpu for MshvVcpu {
|
|||
// Clear the SW_EXIT_INFO1 register to indicate no error
|
||||
self.clear_swexit_info1()?;
|
||||
}
|
||||
_ => panic!(
|
||||
"GHCB_INFO_NORMAL: Unhandled exit code: {:0x}",
|
||||
exit_code
|
||||
),
|
||||
_ => {
|
||||
panic!("GHCB_INFO_NORMAL: Unhandled exit code: {exit_code:0x}")
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => panic!("Unsupported VMGEXIT operation: {:0x}", ghcb_op),
|
||||
_ => panic!("Unsupported VMGEXIT operation: {ghcb_op:0x}"),
|
||||
}
|
||||
|
||||
Ok(cpu::VmExit::Ignore)
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ fn direct_kernel_boot_path() -> PathBuf {
|
|||
|
||||
fn remote_command(api_socket: &str, command: &str, arg: Option<&str>) -> bool {
|
||||
let mut cmd = std::process::Command::new(clh_command("ch-remote"));
|
||||
cmd.args([&format!("--api-socket={}", api_socket), command]);
|
||||
cmd.args([&format!("--api-socket={api_socket}"), command]);
|
||||
|
||||
if let Some(arg) = arg {
|
||||
cmd.arg(arg);
|
||||
|
|
@ -514,7 +514,7 @@ pub fn performance_restore_latency(control: &PerformanceTestControl) -> f64 {
|
|||
assert!(remote_command(
|
||||
&api_socket_source,
|
||||
"snapshot",
|
||||
Some(format!("file://{}", snapshot_dir).as_str()),
|
||||
Some(format!("file://{snapshot_dir}").as_str()),
|
||||
));
|
||||
|
||||
let _ = child.kill();
|
||||
|
|
@ -525,9 +525,9 @@ pub fn performance_restore_latency(control: &PerformanceTestControl) -> f64 {
|
|||
let c = cmd
|
||||
.args([
|
||||
"--restore",
|
||||
format!("source_url=file://{}", snapshot_dir).as_str(),
|
||||
format!("source_url=file://{snapshot_dir}").as_str(),
|
||||
])
|
||||
.args(["--event-monitor", format!("path={}", event_path).as_str()]);
|
||||
.args(["--event-monitor", format!("path={event_path}").as_str()]);
|
||||
|
||||
measure_restore_time(c, event_path.as_str(), control.test_timeout).unwrap()
|
||||
});
|
||||
|
|
|
|||
|
|
@ -726,7 +726,7 @@ pub fn exec_host_command_with_retries(command: &str, retries: u32, interval: Dur
|
|||
for _ in 0..retries {
|
||||
let s = exec_host_command_output(command).status;
|
||||
if !s.success() {
|
||||
eprintln!("\n\n==== retrying in {:?} ===\n\n", interval);
|
||||
eprintln!("\n\n==== retrying in {interval:?} ===\n\n");
|
||||
thread::sleep(interval);
|
||||
} else {
|
||||
return true;
|
||||
|
|
@ -744,7 +744,7 @@ pub fn exec_host_command_output(command: &str) -> Output {
|
|||
let output = std::process::Command::new("bash")
|
||||
.args(["-c", command])
|
||||
.output()
|
||||
.unwrap_or_else(|e| panic!("Expected '{command}' to run. Error: {:?}", e));
|
||||
.unwrap_or_else(|e| panic!("Expected '{command}' to run. Error: {e:?}"));
|
||||
|
||||
if !output.status.success() {
|
||||
let stdout = String::from_utf8_lossy(&output.stdout);
|
||||
|
|
|
|||
|
|
@ -916,9 +916,8 @@ fn check_sequential_events(expected_events: &[&MetaEvent], event_file: &str) ->
|
|||
if !ret {
|
||||
eprintln!(
|
||||
"\n\n==== Start 'check_sequential_events' failed ==== \
|
||||
\n\nexpected_events={:?}\nactual_events={:?} \
|
||||
\n\nexpected_events={expected_events:?}\nactual_events={json_events:?} \
|
||||
\n\n==== End 'check_sequential_events' failed ====",
|
||||
expected_events, json_events,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -936,9 +935,8 @@ fn check_sequential_events_exact(expected_events: &[&MetaEvent], event_file: &st
|
|||
if !expected_events[idx].match_with_json_event(e) {
|
||||
eprintln!(
|
||||
"\n\n==== Start 'check_sequential_events_exact' failed ==== \
|
||||
\n\nexpected_events={:?}\nactual_events={:?} \
|
||||
\n\nexpected_events={expected_events:?}\nactual_events={json_events:?} \
|
||||
\n\n==== End 'check_sequential_events_exact' failed ====",
|
||||
expected_events, json_events,
|
||||
);
|
||||
|
||||
return false;
|
||||
|
|
@ -959,9 +957,8 @@ fn check_latest_events_exact(latest_events: &[&MetaEvent], event_file: &str) ->
|
|||
if !latest_events[idx].match_with_json_event(e) {
|
||||
eprintln!(
|
||||
"\n\n==== Start 'check_latest_events_exact' failed ==== \
|
||||
\n\nexpected_events={:?}\nactual_events={:?} \
|
||||
\n\nexpected_events={latest_events:?}\nactual_events={json_events:?} \
|
||||
\n\n==== End 'check_latest_events_exact' failed ====",
|
||||
latest_events, json_events,
|
||||
);
|
||||
|
||||
return false;
|
||||
|
|
@ -5225,7 +5222,7 @@ mod common_parallel {
|
|||
if landlock_enabled {
|
||||
cmd.args(["--landlock"]).args([
|
||||
"--landlock-rules",
|
||||
format!("path={:?},access=rw", blk_file_path).as_str(),
|
||||
format!("path={blk_file_path:?},access=rw").as_str(),
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
@ -7626,7 +7623,7 @@ mod common_sequential {
|
|||
let mut child = GuestCommand::new(&guest)
|
||||
.args(["--api-socket", &api_socket_source])
|
||||
.args(["--event-monitor", format!("path={event_path}").as_str()])
|
||||
.args(["--cpus", format!("boot={}", n_cpu).as_str()])
|
||||
.args(["--cpus", format!("boot={n_cpu}").as_str()])
|
||||
.args(["--memory", "size=1G"])
|
||||
.args(["--kernel", kernel_path.to_str().unwrap()])
|
||||
.args([
|
||||
|
|
@ -7826,13 +7823,13 @@ mod common_sequential {
|
|||
|
||||
let mut child = GuestCommand::new(&guest)
|
||||
.args(["--api-socket", &api_socket_source])
|
||||
.args(["--event-monitor", format!("path={}", event_path).as_str()])
|
||||
.args(["--event-monitor", format!("path={event_path}").as_str()])
|
||||
.args(["--cpus", "boot=2"])
|
||||
.args(["--memory", "size=1G"])
|
||||
.args(["--kernel", kernel_path.to_str().unwrap()])
|
||||
.default_disks()
|
||||
.default_net()
|
||||
.args(["--vsock", format!("cid=3,socket={}", socket).as_str()])
|
||||
.args(["--vsock", format!("cid=3,socket={socket}").as_str()])
|
||||
.args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
|
||||
.args(device_params)
|
||||
.capture_output()
|
||||
|
|
@ -10355,9 +10352,9 @@ mod live_migration {
|
|||
// Start the 'receive-migration' command on the destination
|
||||
let mut receive_migration = Command::new(clh_command("ch-remote"))
|
||||
.args([
|
||||
&format!("--api-socket={}", dest_api_socket),
|
||||
&format!("--api-socket={dest_api_socket}"),
|
||||
"receive-migration",
|
||||
&format!("tcp:0.0.0.0:{}", migration_port),
|
||||
&format!("tcp:0.0.0.0:{migration_port}"),
|
||||
])
|
||||
.stdin(Stdio::null())
|
||||
.stderr(Stdio::piped())
|
||||
|
|
@ -10371,9 +10368,9 @@ mod live_migration {
|
|||
// Start the 'send-migration' command on the source
|
||||
let mut send_migration = Command::new(clh_command("ch-remote"))
|
||||
.args([
|
||||
&format!("--api-socket={}", src_api_socket),
|
||||
&format!("--api-socket={src_api_socket}"),
|
||||
"send-migration",
|
||||
&format!("tcp:{}:{}", host_ip, migration_port),
|
||||
&format!("tcp:{host_ip}:{migration_port}"),
|
||||
])
|
||||
.stdin(Stdio::null())
|
||||
.stderr(Stdio::piped())
|
||||
|
|
@ -10452,7 +10449,7 @@ mod live_migration {
|
|||
src_vm_cmd
|
||||
.args([
|
||||
"--cpus",
|
||||
format!("boot={},max={}", boot_vcpus, max_vcpus).as_str(),
|
||||
format!("boot={boot_vcpus},max={max_vcpus}").as_str(),
|
||||
])
|
||||
.args(memory_param)
|
||||
.args(["--kernel", kernel_path.to_str().unwrap()])
|
||||
|
|
@ -10957,7 +10954,7 @@ mod rate_limiter {
|
|||
let test_img_path = String::from(
|
||||
test_img_dir
|
||||
.as_path()
|
||||
.join(format!("blk{}.img", i))
|
||||
.join(format!("blk{i}.img"))
|
||||
.to_str()
|
||||
.unwrap(),
|
||||
);
|
||||
|
|
|
|||
|
|
@ -70,8 +70,8 @@ impl Display for HttpError {
|
|||
NotFound => write!(f, "Not Found"),
|
||||
TooManyRequests => write!(f, "Too Many Requests"),
|
||||
InternalServerError => write!(f, "Internal Server Error"),
|
||||
SerdeJsonDeserialize(serde_error) => write!(f, "{}", serde_error),
|
||||
ApiError(api_error) => write!(f, "{}", api_error),
|
||||
SerdeJsonDeserialize(serde_error) => write!(f, "{serde_error}"),
|
||||
ApiError(api_error) => write!(f, "{api_error}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,41 +169,41 @@ impl Display for ApiError {
|
|||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
use self::ApiError::*;
|
||||
match self {
|
||||
EventFdWrite(serde_error) => write!(f, "{}", serde_error),
|
||||
RequestSend(send_error) => write!(f, "{}", send_error),
|
||||
EventFdWrite(serde_error) => write!(f, "{serde_error}"),
|
||||
RequestSend(send_error) => write!(f, "{send_error}"),
|
||||
ResponsePayloadType => write!(f, "Wrong response payload type"),
|
||||
ResponseRecv(recv_error) => write!(f, "{}", recv_error),
|
||||
VmBoot(vm_error) => write!(f, "{}", vm_error),
|
||||
VmCreate(vm_error) => write!(f, "{}", vm_error),
|
||||
VmDelete(vm_error) => write!(f, "{}", vm_error),
|
||||
VmInfo(vm_error) => write!(f, "{}", vm_error),
|
||||
VmPause(vm_error) => write!(f, "{}", vm_error),
|
||||
VmResume(vm_error) => write!(f, "{}", vm_error),
|
||||
ResponseRecv(recv_error) => write!(f, "{recv_error}"),
|
||||
VmBoot(vm_error) => write!(f, "{vm_error}"),
|
||||
VmCreate(vm_error) => write!(f, "{vm_error}"),
|
||||
VmDelete(vm_error) => write!(f, "{vm_error}"),
|
||||
VmInfo(vm_error) => write!(f, "{vm_error}"),
|
||||
VmPause(vm_error) => write!(f, "{vm_error}"),
|
||||
VmResume(vm_error) => write!(f, "{vm_error}"),
|
||||
VmNotBooted => write!(f, "VM is not booted"),
|
||||
VmNotCreated => write!(f, "VM is not created"),
|
||||
VmShutdown(vm_error) => write!(f, "{}", vm_error),
|
||||
VmReboot(vm_error) => write!(f, "{}", vm_error),
|
||||
VmSnapshot(vm_error) => write!(f, "{}", vm_error),
|
||||
VmRestore(vm_error) => write!(f, "{}", vm_error),
|
||||
VmCoredump(vm_error) => write!(f, "{}", vm_error),
|
||||
VmmShutdown(vm_error) => write!(f, "{}", vm_error),
|
||||
VmResize(vm_error) => write!(f, "{}", vm_error),
|
||||
VmResizeZone(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddDevice(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddUserDevice(vm_error) => write!(f, "{}", vm_error),
|
||||
VmRemoveDevice(vm_error) => write!(f, "{}", vm_error),
|
||||
CreateSeccompFilter(seccomp_error) => write!(f, "{}", seccomp_error),
|
||||
ApplySeccompFilter(seccomp_error) => write!(f, "{}", seccomp_error),
|
||||
VmAddDisk(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddFs(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddPmem(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddNet(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddVdpa(vm_error) => write!(f, "{}", vm_error),
|
||||
VmAddVsock(vm_error) => write!(f, "{}", vm_error),
|
||||
VmReceiveMigration(migratable_error) => write!(f, "{}", migratable_error),
|
||||
VmSendMigration(migratable_error) => write!(f, "{}", migratable_error),
|
||||
VmPowerButton(vm_error) => write!(f, "{}", vm_error),
|
||||
VmNmi(vm_error) => write!(f, "{}", vm_error),
|
||||
VmShutdown(vm_error) => write!(f, "{vm_error}"),
|
||||
VmReboot(vm_error) => write!(f, "{vm_error}"),
|
||||
VmSnapshot(vm_error) => write!(f, "{vm_error}"),
|
||||
VmRestore(vm_error) => write!(f, "{vm_error}"),
|
||||
VmCoredump(vm_error) => write!(f, "{vm_error}"),
|
||||
VmmShutdown(vm_error) => write!(f, "{vm_error}"),
|
||||
VmResize(vm_error) => write!(f, "{vm_error}"),
|
||||
VmResizeZone(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddDevice(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddUserDevice(vm_error) => write!(f, "{vm_error}"),
|
||||
VmRemoveDevice(vm_error) => write!(f, "{vm_error}"),
|
||||
CreateSeccompFilter(seccomp_error) => write!(f, "{seccomp_error}"),
|
||||
ApplySeccompFilter(seccomp_error) => write!(f, "{seccomp_error}"),
|
||||
VmAddDisk(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddFs(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddPmem(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddNet(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddVdpa(vm_error) => write!(f, "{vm_error}"),
|
||||
VmAddVsock(vm_error) => write!(f, "{vm_error}"),
|
||||
VmReceiveMigration(migratable_error) => write!(f, "{migratable_error}"),
|
||||
VmSendMigration(migratable_error) => write!(f, "{migratable_error}"),
|
||||
VmPowerButton(vm_error) => write!(f, "{vm_error}"),
|
||||
VmNmi(vm_error) => write!(f, "{vm_error}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue