Skip to content

Commit

Permalink
Update Rust to 1.67.0
Browse files Browse the repository at this point in the history
Update Rust to 1.67.0, in CI, too, which brings changes to std::sync::mpsc [1],
and upgrade our dependencies to prepare for release

- [1]: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html

Signed-off-by: Francisco Javier Honduvilla Coto <javierhonduco@gmail.com>
  • Loading branch information
javierhonduco committed Jan 29, 2023
1 parent a79b38e commit a6aac37
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 82 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
rust: [stable]
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.64.0
- uses: dtolnay/rust-toolchain@1.67.0
with:
toolchain: ${{matrix.rust}}
components: rust-src, rustfmt
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
rust: [stable]
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.64.0
- uses: dtolnay/rust-toolchain@1.67.0
with:
toolchain: ${{matrix.rust}}
components: rust-src, rustfmt
Expand All @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.64.0
- uses: dtolnay/rust-toolchain@1.67.0
with:
components: rust-src, clippy, rustfmt
- name: Install build system dependencies
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
rust: [stable]
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.64.0
- uses: dtolnay/rust-toolchain@1.67.0
with:
toolchain: ${{matrix.rust}}
components: rust-src, rustfmt
Expand Down
97 changes: 61 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ goblin = "0.6.0"
anyhow = {version= "1.0.68", features = ["backtrace"]}
proc-maps = "0.3.0"
serde = {version = "1.0.152", features = ["derive"] }
clap = {version = "4.1.1", features = ["derive"]}
clap = {version = "4.1.4", features = ["derive"]}
serde_json = "1.0.91"
chrono = "0.4.23"
inferno = "0.11.14"
Expand Down
22 changes: 8 additions & 14 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl ParseCallbacks for BuildCallbacks {
// Copied from bindgen::CargoCallbacks, to tell cargo to invalidate
// the built crate whenever any of the included header files changed.
fn include_file(&self, filename: &str) {
println!("cargo:rerun-if-changed={}", filename);
println!("cargo:rerun-if-changed={filename}");
}
}

Expand Down Expand Up @@ -65,7 +65,7 @@ fn main() {
.unwrap()
.read_to_string(&mut contents)
.unwrap();
let new_contents = format!("use serde::{{Serialize, Deserialize}};\n{}", contents);
let new_contents = format!("use serde::{{Serialize, Deserialize}};\n{contents}");
File::create(&bindings_out_file)
.unwrap()
.write_all(new_contents.as_bytes())
Expand All @@ -80,7 +80,7 @@ fn main() {
Ok(_) => {}
Err(err) => match err {
Error::Build(msg) | Error::Generate(msg) => {
panic!("Error running SkeletonBuilder for rbperf = {}", msg);
panic!("Error running SkeletonBuilder for rbperf = {msg}");
}
},
}
Expand All @@ -91,10 +91,7 @@ fn main() {
.unwrap()
.read_to_string(&mut contents)
.unwrap();
let new_contents = format!(
"#![allow(clippy::derive_partial_eq_without_eq)]\n{}",
contents
);
let new_contents = format!("#![allow(clippy::derive_partial_eq_without_eq)]\n{contents}");
File::create(skel)
.unwrap()
.write_all(new_contents.as_bytes())
Expand All @@ -110,15 +107,12 @@ fn main() {
Ok(_) => {}
Err(err) => match err {
Error::Build(msg) | Error::Generate(msg) => {
panic!(
"Error running SkeletonBuilder for feature detector = {}",
msg
);
panic!("Error running SkeletonBuilder for feature detector = {msg}");
}
},
}

println!("cargo:rerun-if-changed={}", RUBY_STACK_SOURCE);
println!("cargo:rerun-if-changed={}", RUBY_STACK_HEADER);
println!("cargo:rerun-if-changed={}", FEATURES_SOURCE);
println!("cargo:rerun-if-changed={RUBY_STACK_SOURCE}");
println!("cargo:rerun-if-changed={RUBY_STACK_HEADER}");
println!("cargo:rerun-if-changed={FEATURES_SOURCE}");
}
5 changes: 1 addition & 4 deletions src/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,7 @@ pub unsafe fn setup_syscall_event(syscall: &str) -> Result<c_int> {
..Default::default()
};

let path = format!(
"/sys/kernel/debug/tracing/events/syscalls/sys_{}/id",
syscall
);
let path = format!("/sys/kernel/debug/tracing/events/syscalls/sys_{syscall}/id");
let mut id = fs::read_to_string(&path).map_err(|_| EventError::EventNameDoesNotExist {
name: syscall.to_string(),
})?;
Expand Down
8 changes: 4 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ fn main() -> Result<()> {
println!();

for syscall in available_syscalls() {
println!("{}", syscall);
println!("{syscall}");
}
return Ok(());
}
Expand Down Expand Up @@ -174,20 +174,20 @@ fn main() -> Result<()> {
let now: DateTime<Utc> = Utc::now();
let name_suffix = now.format("%m%d%Y_%Hh%Mm%Ss");

let flame_path = format!("rbperf_flame_{}.svg", name_suffix);
let flame_path = format!("rbperf_flame_{name_suffix}.svg");
let f = File::create(&flame_path).unwrap();
flamegraph::from_reader(&mut options, data, f).unwrap();

let serialized = serde_json::to_string(&profile).unwrap();
fs::write(format!("rbperf_out_{}.json", name_suffix), serialized)
fs::write(format!("rbperf_out_{name_suffix}.json"), serialized)
.expect("Unable to write file");

println!(
"Got {} samples and {} errors",
stats.total_events,
stats.total_errors()
);
println!("Flamegraph written to: {}", flame_path);
println!("Flamegraph written to: {flame_path}");
}
}

Expand Down
Loading

0 comments on commit a6aac37

Please sign in to comment.