bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

std: Apply deprecated_safe_2024

Browse source
This commit is contained in:
Eric Huss 2025-02-13 12:53:52 -08:00
parent 36733f3bce
commit ef20a1b1f8
5 changed files with 66 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/env.rs
View file

@ -568,7 +568,7 @@ pub struct JoinPathsError {
/// let mut paths = env::split_paths(&path).collect::<Vec<_>>();
/// paths.push(PathBuf::from("/home/xyz/bin"));
/// let new_path = env::join_paths(paths)?;
/// env::set_var("PATH", &new_path);
/// unsafe { env::set_var("PATH", &new_path); }
/// }
///
/// Ok(())

8
library/std/src/process/tests.rs
View file

@ -323,9 +323,13 @@ fn test_capture_env_at_spawn() {
// This variable will not be present if the environment has already
// been captured above.
env::set_var("RUN_TEST_NEW_ENV2", "456");
unsafe {
env::set_var("RUN_TEST_NEW_ENV2", "456");
}
let result = cmd.output().unwrap();
env::remove_var("RUN_TEST_NEW_ENV2");
unsafe {
env::remove_var("RUN_TEST_NEW_ENV2");
}
let output = String::from_utf8_lossy(&result.stdout).to_string();

8
library/std/src/sys/pal/uefi/process.rs
View file

@ -154,8 +154,8 @@ impl Command {
if let Some(e) = &env {
for (k, (_, v)) in e {
match v {
Some(v) => crate::env::set_var(k, v),
None => crate::env::remove_var(k),
Some(v) => unsafe { crate::env::set_var(k, v) },
None => unsafe { crate::env::remove_var(k) },
}
}
}
@ -166,8 +166,8 @@ impl Command {
if let Some(e) = env {
for (k, (v, _)) in e {
match v {
Some(v) => crate::env::set_var(k, v),
None => crate::env::remove_var(k),
Some(v) => unsafe { crate::env::set_var(k, v) },
None => unsafe { crate::env::remove_var(k) },
}
}
}

6
library/std/src/sys/pal/windows/process/tests.rs
View file

@ -138,8 +138,10 @@ fn windows_env_unicode_case() {
let mut cmd = Command::new("cmd");
cmd.env(a, "1");
cmd.env(b, "2");
env::set_var(a, "1");
env::set_var(b, "2");
unsafe {
env::set_var(a, "1");
env::set_var(b, "2");
}
for (key, value) in cmd.get_envs() {
assert_eq!(