Skip to content

Commit 6f9c4a2

Browse files
authored
chore(deps): upgrade rust and dependencies (#82)
1 parent d75fce0 commit 6f9c4a2

9 files changed

Lines changed: 63 additions & 71 deletions

File tree

Cargo.lock

Lines changed: 47 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ repository = "https://github.com/edera-dev/sprout"
1717
edition = "2024"
1818

1919
[workspace.dependencies]
20-
bitflags = "2.10.0"
20+
bitflags = "2.11.1"
2121
log = "0.4.29"
2222
spin = "0.10.0"
23-
uefi-raw = "0.13.0"
23+
uefi-raw = "0.14.0"
2424

2525
[workspace.dependencies.anyhow]
26-
version = "1.0.100"
26+
version = "1.0.102"
2727
default-features = false
2828

2929
[workspace.dependencies.hex]
@@ -42,20 +42,20 @@ default-features = false
4242
features = ["alloc", "derive"]
4343

4444
[workspace.dependencies.sha2]
45-
version = "0.10.9"
45+
version = "0.11.0"
4646
default-features = false
4747

4848
[workspace.dependencies.shlex]
4949
version = "1.3.0"
5050
default-features = false
5151

5252
[workspace.dependencies.toml]
53-
version = "0.9.11"
53+
version = "1.1.2"
5454
default-features = false
5555
features = ["serde", "parse"]
5656

5757
[workspace.dependencies.uefi]
58-
version = "0.36.1"
58+
version = "0.37.0"
5959
default-features = false
6060
features = ["alloc", "global_allocator", "panic_handler"]
6161

crates/boot/src/autoconfigure/bls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ pub fn scan(
3030

3131
// Convert the device path root to a string we can use in the configuration.
3232
let mut root = root
33-
.to_string(DisplayOnly(false), AllowShortcuts(false))
33+
.to_string16(DisplayOnly(false), AllowShortcuts(false))
3434
.context("unable to convert device root to string")?
3535
.to_string();
3636
// Add a trailing forward-slash to the root to ensure the device root is completed.

crates/boot/src/autoconfigure/linux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pub fn scan(
158158

159159
// Convert the device path root to a string we can use in the configuration.
160160
let mut root = root
161-
.to_string(DisplayOnly(false), AllowShortcuts(false))
161+
.to_string16(DisplayOnly(false), AllowShortcuts(false))
162162
.context("unable to convert device root to string")?
163163
.to_string();
164164
// Add a trailing forward-slash to the root to ensure the device root is completed.

crates/boot/src/autoconfigure/windows.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn scan(
3838

3939
// Convert the device path root to a string we can use in the configuration.
4040
let mut root = root
41-
.to_string(DisplayOnly(false), AllowShortcuts(false))
41+
.to_string16(DisplayOnly(false), AllowShortcuts(false))
4242
.context("unable to convert device root to string")?
4343
.to_string();
4444
// Add a trailing forward-slash to the root to ensure the device root is completed.

crates/boot/src/generators/bls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub fn generate(context: Rc<SproutContext>, bls: &BlsConfiguration) -> Result<Ve
4949
let mut entries_path = PathBuf::from(
5050
bls_resolved
5151
.sub_path
52-
.to_string(DisplayOnly(false), AllowShortcuts(false))
52+
.to_string16(DisplayOnly(false), AllowShortcuts(false))
5353
.context("unable to convert bls path to string")?,
5454
);
5555
entries_path.push(cstr16!("entries"));

crates/eficore/src/path.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl ResolvedPath {
3434
let mut fs = FileSystem::new(fs);
3535
let path = self
3636
.sub_path
37-
.to_string(DisplayOnly(false), AllowShortcuts(false))?;
37+
.to_string16(DisplayOnly(false), AllowShortcuts(false))?;
3838
let content = fs.read(Path::new(&path));
3939
content.context("unable to read file contents")
4040
}
@@ -68,7 +68,7 @@ pub fn device_path_root(path: &DevicePath) -> Result<String> {
6868
let mut path = path
6969
.node_iter()
7070
.filter_map(|item| {
71-
let item = item.to_string(DisplayOnly(false), AllowShortcuts(false));
71+
let item = item.to_string16(DisplayOnly(false), AllowShortcuts(false));
7272
if item
7373
.as_ref()
7474
.map(|item| cstring16_contains_char(item, '('))
@@ -93,7 +93,7 @@ pub fn device_path_subpath(path: &DevicePath) -> Result<String> {
9393
let path = path
9494
.node_iter()
9595
.filter_map(|item| {
96-
let item = item.to_string(DisplayOnly(false), AllowShortcuts(false));
96+
let item = item.to_string16(DisplayOnly(false), AllowShortcuts(false));
9797
if item
9898
.as_ref()
9999
.map(|item| cstring16_contains_char(item, '('))
@@ -124,7 +124,7 @@ pub fn resolve_path(
124124
.node_iter()
125125
.next()
126126
.map(|it| {
127-
it.to_string(DisplayOnly(false), AllowShortcuts(false))
127+
it.to_string16(DisplayOnly(false), AllowShortcuts(false))
128128
.unwrap_or_default()
129129
})
130130
.map(|it| it.to_string().contains('('))

crates/eficore/src/shim.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl<'a> ShimInput<'a> {
8282
};
8383
// Convert the underlying path to a string.
8484
let path = path
85-
.to_string(DisplayOnly(false), AllowShortcuts(false))
85+
.to_string16(DisplayOnly(false), AllowShortcuts(false))
8686
.context("unable to convert device path to string")?;
8787
let path = crate::path::resolve_path(None, path.to_string())
8888
.context("unable to resolve path")?;

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.93.0"
2+
channel = "1.95.0"
33
components = ["rustfmt", "clippy"]
44
targets = ["x86_64-unknown-uefi", "aarch64-unknown-uefi"]

0 commit comments

Comments
 (0)