Skip to content

Commit 1aaaa33

Browse files
committed
build: update Rust to 1.95 and nightly
Signed-off-by: Jérémy Audiger <jeremy.audiger@icloud.com>
1 parent c1de14d commit 1aaaa33

7 files changed

Lines changed: 9 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ concurrency:
1111
group: ${{ github.workflow }}-${{ github.ref }}
1212

1313
env:
14-
NIGHTLY_TOOLCHAIN: nightly-2026-03-15
14+
NIGHTLY_TOOLCHAIN: nightly-2026-04-15
1515
# Default environment variables for Cargo
1616
CARGO_INCREMENTAL: "0"
1717
CARGO_PROFILE_DEV_DEBUG: "false"

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace.package]
22
edition = "2024"
3-
rust-version = "1.94" # To align with the rust-toolchain.toml
3+
rust-version = "1.95" # To align with the rust-toolchain.toml
44

55
[workspace]
66
members = [

crates/brioche-packed-userland-exec/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ rust-version.workspace = true
77
[dependencies]
88
brioche-pack = { workspace = true }
99
brioche-resources = { path = "../brioche-resources" }
10-
cfg-if = "1.0.4"
1110
libc = "0.2.184"
1211
thiserror = "2.0.18"
1312

crates/brioche-packed-userland-exec/src/main.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33

44
mod linux;
55

6-
cfg_if::cfg_if! {
7-
if #[cfg(target_os = "linux")] {
6+
cfg_select! {
7+
target_os = "linux" => {
88
#[cfg_attr(not(test), unsafe(no_mangle))]
99
#[allow(clippy::missing_safety_doc, clippy::similar_names)]
1010
pub unsafe extern "C" fn main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int {
1111
unsafe {
1212
linux::entrypoint(argc, argv)
1313
}
1414
}
15-
} else {
15+
}
16+
_ => {
1617
fn main() {
1718
eprintln!("brioche-packed-userland-exec is only supported on Linux");
1819
std::process::exit(1);

crates/brioche-strip/src/main.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,8 @@ fn finish_remapped_file(remapped_file: RemapFile) -> eyre::Result<()> {
385385
output_path,
386386
} => {
387387
// Open the output file
388-
let mut output = std::fs::File::create(output_path).with_context(|| {
389-
format!("failed to open output {}", temp_file.path().display(),)
390-
})?;
388+
let mut output = std::fs::File::create(output_path)
389+
.with_context(|| format!("failed to open output {}", temp_file.path().display()))?;
391390

392391
// Copy the temp file to the output
393392
temp_file.rewind()?;

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "1.94"
2+
channel = "1.95"
33
profile = "default"
44
targets = ["x86_64-unknown-linux-musl"]

0 commit comments

Comments
 (0)