Skip to content
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 .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

env:
NIGHTLY_TOOLCHAIN: nightly-2026-03-15
NIGHTLY_TOOLCHAIN: nightly-2026-04-15
# Default environment variables for Cargo
CARGO_INCREMENTAL: "0"
CARGO_PROFILE_DEV_DEBUG: "false"
Expand Down
1 change: 0 additions & 1 deletion 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
@@ -1,6 +1,6 @@
[workspace.package]
edition = "2024"
rust-version = "1.94" # To align with the rust-toolchain.toml
rust-version = "1.95" # To align with the rust-toolchain.toml

[workspace]
members = [
Expand Down
1 change: 0 additions & 1 deletion crates/brioche-packed-userland-exec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ rust-version.workspace = true
[dependencies]
brioche-pack = { workspace = true }
brioche-resources = { path = "../brioche-resources" }
cfg-if = "1.0.4"
libc = "0.2.184"
thiserror = "2.0.18"

Expand Down
7 changes: 4 additions & 3 deletions crates/brioche-packed-userland-exec/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@

mod linux;

cfg_if::cfg_if! {
if #[cfg(target_os = "linux")] {
cfg_select! {
target_os = "linux" => {
#[cfg_attr(not(test), unsafe(no_mangle))]
#[allow(clippy::missing_safety_doc, clippy::similar_names)]
pub unsafe extern "C" fn main(argc: libc::c_int, argv: *const *const libc::c_char) -> libc::c_int {
unsafe {
linux::entrypoint(argc, argv)
}
}
} else {
}
_ => {
fn main() {
eprintln!("brioche-packed-userland-exec is only supported on Linux");
std::process::exit(1);
Expand Down
5 changes: 2 additions & 3 deletions crates/brioche-strip/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,8 @@ fn finish_remapped_file(remapped_file: RemapFile) -> eyre::Result<()> {
output_path,
} => {
// Open the output file
let mut output = std::fs::File::create(output_path).with_context(|| {
format!("failed to open output {}", temp_file.path().display(),)
})?;
let mut output = std::fs::File::create(output_path)
.with_context(|| format!("failed to open output {}", temp_file.path().display()))?;

// Copy the temp file to the output
temp_file.rewind()?;
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.94"
channel = "1.95"
profile = "default"
targets = ["x86_64-unknown-linux-musl"]