mirror of
https://github.com/edera-dev/sprout.git
synced 2026-05-07 17:00:17 +00:00
chore(deps): upgrade rust and dependencies (#82)
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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"));
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
@@ -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, '('))
|
||||
@@ -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, '('))
|
||||
@@ -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('('))
|
||||
|
||||
@@ -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")?;
|
||||
|
||||
Reference in New Issue
Block a user