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 Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace.package]
edition = "2024"
rust-version = "1.87" # To align with the rust-toolchain.toml
rust-version = "1.88" # To align with the rust-toolchain.toml

[workspace]
members = [
Expand Down
20 changes: 10 additions & 10 deletions crates/brioche-resources/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ pub fn find_resource_dirs(
paths.push(PathBuf::from(pack_resource_dir));
}

if include_readonly {
if let Some(input_resource_dirs) = std::env::var_os("BRIOCHE_INPUT_RESOURCE_DIRS") {
if let Some(input_resource_dirs) = <[u8]>::from_os_str(&input_resource_dirs) {
for input_resource_dir in input_resource_dirs.split_str(b":") {
if let Ok(path) = input_resource_dir.to_path() {
paths.push(path.to_owned());
}
if include_readonly
&& let Some(input_resource_dirs) = std::env::var_os("BRIOCHE_INPUT_RESOURCE_DIRS")
{
if let Some(input_resource_dirs) = <[u8]>::from_os_str(&input_resource_dirs) {
for input_resource_dir in input_resource_dirs.split_str(b":") {
if let Ok(path) = input_resource_dir.to_path() {
paths.push(path.to_owned());
}
}
}

for input_resource_dir in std::env::split_paths(&input_resource_dirs) {
paths.push(input_resource_dir);
}
for input_resource_dir in std::env::split_paths(&input_resource_dirs) {
paths.push(input_resource_dir);
}
}

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.87"
channel = "1.88"
profile = "default"
targets = ["x86_64-unknown-linux-musl"]