Skip to content

chore: bump rust toolchain to 1.88.0 #104

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.

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
merged 1 commit into from
Jun 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/cargo-codspeed/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ impl BuildOptions<'_> {
println!("{}", &msg.message);
}
Message::TextLine(line) => {
println!("{}", line);
println!("{line}");
}
Message::CompilerArtifact(artifact)
if artifact.target.is_kind(TargetKind::Bench) =>
Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-codspeed/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fn main() {
};

if let Err(e) = app::run(args_vec.into_iter()) {
eprintln!("{}", e);
eprintln!("{e}");
exit(1);
}
}
7 changes: 2 additions & 5 deletions crates/cargo-codspeed/src/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,11 @@ pub fn run_benches(
.or(status.signal().map(|s| 128 + s)) // 128+N indicates that a command was interrupted by signal N (see: https://tldp.org/LDP/abs/html/exitcodes.html)
.unwrap_or(1);

eprintln!(
"failed to execute the benchmark process, exit code: {}",
code
);
eprintln!("failed to execute the benchmark process, exit code: {code}");
std::process::exit(code);
}
})?;
eprintln!("Done running {}", bench_name);
eprintln!("Done running {bench_name}");
}
eprintln!("Finished running {} benchmark suite(s)", to_run.len());

Expand Down
2 changes: 1 addition & 1 deletion crates/cargo-codspeed/tests/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn setup(dir: &str, project: Project) -> String {
copy_opts.content_only = true;
copy(dir, &tmp_dir, &copy_opts).unwrap();
if env::var("DEBUG").is_ok() {
println!("tmp_dir={:?}", tmp_dir);
println!("tmp_dir={tmp_dir:?}");
}

let package_root = PathBuf::from_str(env!("CARGO_MANIFEST_DIR")).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion crates/codspeed/src/walltime_results.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ impl WalltimeBenchmark {
let output_dir = result_dir_from_workspace_root(workspace_root).join(scope);
std::fs::create_dir_all(&output_dir).unwrap();
let bench_id = uuid::Uuid::new_v4().to_string();
let output_path = output_dir.join(format!("{}.json", bench_id));
let output_path = output_dir.join(format!("{bench_id}.json"));
let mut writer = std::fs::File::create(&output_path).expect("Failed to create the file");
serde_json::to_writer_pretty(&mut writer, self).expect("Failed to write the data");
writer.flush().expect("Failed to flush the writer");
Expand Down
10 changes: 5 additions & 5 deletions crates/criterion_compat/src/compat/group.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ impl<'a, M: Measurement> BenchmarkGroup<'a, M> {
self.group_name,
);
if let Some(function_name) = id.function_name {
uri = format!("{}::{}", uri, function_name);
uri = format!("{uri}::{function_name}");
}
if let Some(parameter) = id.parameter {
uri = format!("{}[{}]", uri, parameter);
uri = format!("{uri}[{parameter}]");
}
let mut b = Bencher::new(self.codspeed.clone(), uri);
f(&mut b, input);
Expand Down Expand Up @@ -129,7 +129,7 @@ impl BenchmarkId {
) -> BenchmarkId {
BenchmarkId {
function_name: Some(function_name.into()),
parameter: Some(format!("{}", parameter)),
parameter: Some(format!("{parameter}")),
}
}

Expand All @@ -138,7 +138,7 @@ impl BenchmarkId {
pub fn from_parameter<P: ::std::fmt::Display>(parameter: P) -> BenchmarkId {
BenchmarkId {
function_name: None,
parameter: Some(format!("{}", parameter)),
parameter: Some(format!("{parameter}")),
}
}

Expand All @@ -152,7 +152,7 @@ impl BenchmarkId {
pub(crate) fn no_function_with_input<P: ::std::fmt::Display>(parameter: P) -> BenchmarkId {
BenchmarkId {
function_name: None,
parameter: Some(format!("{}", parameter)),
parameter: Some(format!("{parameter}")),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion crates/divan_compat/divan_fork/src/entry/generic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ impl EntryConst {
/// Returns [`PartialOrd::partial_cmp`] ordering if `<` or `>, falling back
/// to comparing [`ToString::to_string`] otherwise.
pub(crate) fn cmp_name(&self, other: &Self) -> Ordering {
if self.partial_cmp == other.partial_cmp {
if self.partial_cmp as usize == other.partial_cmp as usize {
// SAFETY: Both constants have the same comparison function, so they
// must be the same type.
if let Some(ordering) = unsafe { (self.partial_cmp)(self.value, other.value) } {
Expand Down
2 changes: 1 addition & 1 deletion crates/divan_compat/examples/benches/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ fn main() {
#[divan::bench]
fn print_env_hello() {
let env_var = std::env::var("MY_ENV_VAR").unwrap_or("not set".to_string());
println!("MY_ENV_VAR is {}", env_var);
println!("MY_ENV_VAR is {env_var}");
}
2 changes: 1 addition & 1 deletion crates/divan_compat/src/compat/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn main() {
if let Some(options) = &meta.bench_options {
if let Some(true) = options.ignore {
let uri = uri::generate(&entry, entry.display_name());
println!("Skipped: {}", uri);
println!("Skipped: {uri}");
continue;
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.84"
channel = "1.88"
Loading