Skip to content

Commit fed2b01

Browse files
authored
Update rust (#41)
* build: update Rust to 1.88 Signed-off-by: Jérémy Audiger <jeremy.audiger@icloud.com> * refactor: merge two consecutives if statements Signed-off-by: Jérémy Audiger <jeremy.audiger@icloud.com> --------- Signed-off-by: Jérémy Audiger <jeremy.audiger@icloud.com>
1 parent 736b7b8 commit fed2b01

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

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.87" # To align with the rust-toolchain.toml
3+
rust-version = "1.88" # To align with the rust-toolchain.toml
44

55
[workspace]
66
members = [

crates/brioche-resources/src/lib.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ pub fn find_resource_dirs(
1717
paths.push(PathBuf::from(pack_resource_dir));
1818
}
1919

20-
if include_readonly {
21-
if let Some(input_resource_dirs) = std::env::var_os("BRIOCHE_INPUT_RESOURCE_DIRS") {
22-
if let Some(input_resource_dirs) = <[u8]>::from_os_str(&input_resource_dirs) {
23-
for input_resource_dir in input_resource_dirs.split_str(b":") {
24-
if let Ok(path) = input_resource_dir.to_path() {
25-
paths.push(path.to_owned());
26-
}
20+
if include_readonly
21+
&& let Some(input_resource_dirs) = std::env::var_os("BRIOCHE_INPUT_RESOURCE_DIRS")
22+
{
23+
if let Some(input_resource_dirs) = <[u8]>::from_os_str(&input_resource_dirs) {
24+
for input_resource_dir in input_resource_dirs.split_str(b":") {
25+
if let Ok(path) = input_resource_dir.to_path() {
26+
paths.push(path.to_owned());
2727
}
2828
}
29+
}
2930

30-
for input_resource_dir in std::env::split_paths(&input_resource_dirs) {
31-
paths.push(input_resource_dir);
32-
}
31+
for input_resource_dir in std::env::split_paths(&input_resource_dirs) {
32+
paths.push(input_resource_dir);
3333
}
3434
}
3535

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

0 commit comments

Comments
 (0)