mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #85136 - shirshak55:master, r=dtolnay

Browse Source 
Change param name (k to key and v to value) in std::env module

1. When I was reading code the ide displayed `k` and `v`, so I
thought it would be better to show key and value?

2. I noticed var method already uses `key` instead of `k` so it
is more consistent to use `key` instead of `k`?

Thanks
This commit is contained in:
Yuki Okushi 2021-05-12 07:18:02 +09:00 committed by GitHub
commit 6ec4f91610
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/std/src/env.rs
View File

@ -324,13 +324,13 @@ impl Error for VarError {
/// assert_eq!(env::var(key), Ok("VALUE".to_string())); /// assert_eq!(env::var(key), Ok("VALUE".to_string()));
/// ``` /// ```
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub fn set_var<K: AsRef<OsStr>, V: AsRef<OsStr>>(k: K, v: V) { pub fn set_var<K: AsRef<OsStr>, V: AsRef<OsStr>>(key: K, value: V) {
_set_var(k.as_ref(), v.as_ref()) _set_var(key.as_ref(), value.as_ref())
} }
fn _set_var(k: &OsStr, v: &OsStr) { fn _set_var(key: &OsStr, value: &OsStr) {
os_imp::setenv(k, v).unwrap_or_else(|e| { os_imp::setenv(key, value).unwrap_or_else(|e| {
panic!("failed to set environment variable `{:?}` to `{:?}`: {}", k, v, e) panic!("failed to set environment variable `{:?}` to `{:?}`: {}", key, value, e)
}) })
} }
@ -366,13 +366,13 @@ fn _set_var(k: &OsStr, v: &OsStr) {
/// assert!(env::var(key).is_err()); /// assert!(env::var(key).is_err());
/// ``` /// ```
#[stable(feature = "env", since = "1.0.0")] #[stable(feature = "env", since = "1.0.0")]
pub fn remove_var<K: AsRef<OsStr>>(k: K) { pub fn remove_var<K: AsRef<OsStr>>(key: K) {
_remove_var(k.as_ref()) _remove_var(key.as_ref())
} }
fn _remove_var(k: &OsStr) { fn _remove_var(key: &OsStr) {
os_imp::unsetenv(k) os_imp::unsetenv(key)
.unwrap_or_else(|e| panic!("failed to remove environment variable `{:?}`: {}", k, e)) .unwrap_or_else(|e| panic!("failed to remove environment variable `{:?}`: {}", key, e))
} }
/// An iterator that splits an environment variable into paths according to /// An iterator that splits an environment variable into paths according to