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
102 changes: 47 additions & 55 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ repository = "https://github.com/edera-dev/sprout"
edition = "2024"

[workspace.dependencies]
bitflags = "2.10.0"
bitflags = "2.11.1"
log = "0.4.29"
spin = "0.10.0"
uefi-raw = "0.13.0"
uefi-raw = "0.14.0"

[workspace.dependencies.anyhow]
version = "1.0.100"
version = "1.0.102"
default-features = false

[workspace.dependencies.hex]
Expand All @@ -42,20 +42,20 @@ default-features = false
features = ["alloc", "derive"]

[workspace.dependencies.sha2]
version = "0.10.9"
version = "0.11.0"
default-features = false

[workspace.dependencies.shlex]
version = "1.3.0"
default-features = false

[workspace.dependencies.toml]
version = "0.9.11"
version = "1.1.2"
default-features = false
features = ["serde", "parse"]

[workspace.dependencies.uefi]
version = "0.36.1"
version = "0.37.0"
default-features = false
features = ["alloc", "global_allocator", "panic_handler"]

Expand Down
2 changes: 1 addition & 1 deletion crates/boot/src/autoconfigure/bls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub fn scan(

// Convert the device path root to a string we can use in the configuration.
let mut root = root
.to_string(DisplayOnly(false), AllowShortcuts(false))
.to_string16(DisplayOnly(false), AllowShortcuts(false))
.context("unable to convert device root to string")?
.to_string();
// Add a trailing forward-slash to the root to ensure the device root is completed.
Expand Down
2 changes: 1 addition & 1 deletion crates/boot/src/autoconfigure/linux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ pub fn scan(

// Convert the device path root to a string we can use in the configuration.
let mut root = root
.to_string(DisplayOnly(false), AllowShortcuts(false))
.to_string16(DisplayOnly(false), AllowShortcuts(false))
.context("unable to convert device root to string")?
.to_string();
// Add a trailing forward-slash to the root to ensure the device root is completed.
Expand Down
2 changes: 1 addition & 1 deletion crates/boot/src/autoconfigure/windows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub fn scan(

// Convert the device path root to a string we can use in the configuration.
let mut root = root
.to_string(DisplayOnly(false), AllowShortcuts(false))
.to_string16(DisplayOnly(false), AllowShortcuts(false))
.context("unable to convert device root to string")?
.to_string();
// Add a trailing forward-slash to the root to ensure the device root is completed.
Expand Down
2 changes: 1 addition & 1 deletion crates/boot/src/generators/bls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub fn generate(context: Rc<SproutContext>, bls: &BlsConfiguration) -> Result<Ve
let mut entries_path = PathBuf::from(
bls_resolved
.sub_path
.to_string(DisplayOnly(false), AllowShortcuts(false))
.to_string16(DisplayOnly(false), AllowShortcuts(false))
.context("unable to convert bls path to string")?,
);
entries_path.push(cstr16!("entries"));
Expand Down
8 changes: 4 additions & 4 deletions crates/eficore/src/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl ResolvedPath {
let mut fs = FileSystem::new(fs);
let path = self
.sub_path
.to_string(DisplayOnly(false), AllowShortcuts(false))?;
.to_string16(DisplayOnly(false), AllowShortcuts(false))?;
let content = fs.read(Path::new(&path));
content.context("unable to read file contents")
}
Expand Down Expand Up @@ -68,7 +68,7 @@ pub fn device_path_root(path: &DevicePath) -> Result<String> {
let mut path = path
.node_iter()
.filter_map(|item| {
let item = item.to_string(DisplayOnly(false), AllowShortcuts(false));
let item = item.to_string16(DisplayOnly(false), AllowShortcuts(false));
if item
.as_ref()
.map(|item| cstring16_contains_char(item, '('))
Expand All @@ -93,7 +93,7 @@ pub fn device_path_subpath(path: &DevicePath) -> Result<String> {
let path = path
.node_iter()
.filter_map(|item| {
let item = item.to_string(DisplayOnly(false), AllowShortcuts(false));
let item = item.to_string16(DisplayOnly(false), AllowShortcuts(false));
if item
.as_ref()
.map(|item| cstring16_contains_char(item, '('))
Expand Down Expand Up @@ -124,7 +124,7 @@ pub fn resolve_path(
.node_iter()
.next()
.map(|it| {
it.to_string(DisplayOnly(false), AllowShortcuts(false))
it.to_string16(DisplayOnly(false), AllowShortcuts(false))
.unwrap_or_default()
})
.map(|it| it.to_string().contains('('))
Expand Down
2 changes: 1 addition & 1 deletion crates/eficore/src/shim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl<'a> ShimInput<'a> {
};
// Convert the underlying path to a string.
let path = path
.to_string(DisplayOnly(false), AllowShortcuts(false))
.to_string16(DisplayOnly(false), AllowShortcuts(false))
.context("unable to convert device path to string")?;
let path = crate::path::resolve_path(None, path.to_string())
.context("unable to resolve path")?;
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.93.0"
channel = "1.95.0"
components = ["rustfmt", "clippy"]
targets = ["x86_64-unknown-uefi", "aarch64-unknown-uefi"]
Loading