Skip to content

Commit 6ec4f91

Browse files
authored
Rollup merge of #85136 - shirshak55:master, r=dtolnay
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
2 parents 4ab3050 + 0778e8d commit 6ec4f91

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

library/std/src/env.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -324,13 +324,13 @@ impl Error for VarError {
324324
/// assert_eq!(env::var(key), Ok("VALUE".to_string()));
325325
/// ```
326326
#[stable(feature = "env", since = "1.0.0")]
327-
pub fn set_var<K: AsRef<OsStr>, V: AsRef<OsStr>>(k: K, v: V) {
328-
_set_var(k.as_ref(), v.as_ref())
327+
pub fn set_var<K: AsRef<OsStr>, V: AsRef<OsStr>>(key: K, value: V) {
328+
_set_var(key.as_ref(), value.as_ref())
329329
}
330330

331-
fn _set_var(k: &OsStr, v: &OsStr) {
332-
os_imp::setenv(k, v).unwrap_or_else(|e| {
333-
panic!("failed to set environment variable `{:?}` to `{:?}`: {}", k, v, e)
331+
fn _set_var(key: &OsStr, value: &OsStr) {
332+
os_imp::setenv(key, value).unwrap_or_else(|e| {
333+
panic!("failed to set environment variable `{:?}` to `{:?}`: {}", key, value, e)
334334
})
335335
}
336336

@@ -366,13 +366,13 @@ fn _set_var(k: &OsStr, v: &OsStr) {
366366
/// assert!(env::var(key).is_err());
367367
/// ```
368368
#[stable(feature = "env", since = "1.0.0")]
369-
pub fn remove_var<K: AsRef<OsStr>>(k: K) {
370-
_remove_var(k.as_ref())
369+
pub fn remove_var<K: AsRef<OsStr>>(key: K) {
370+
_remove_var(key.as_ref())
371371
}
372372

373-
fn _remove_var(k: &OsStr) {
374-
os_imp::unsetenv(k)
375-
.unwrap_or_else(|e| panic!("failed to remove environment variable `{:?}`: {}", k, e))
373+
fn _remove_var(key: &OsStr) {
374+
os_imp::unsetenv(key)
375+
.unwrap_or_else(|e| panic!("failed to remove environment variable `{:?}`: {}", key, e))
376376
}
377377

378378
/// An iterator that splits an environment variable into paths according to

0 commit comments

Comments
 (0)