Skip to content

Commit 9438fe3

Browse files
authored
Avoid naming variables str (#15025)
This renames variables named `str` to other names, to make sure `str` always refers to a type.
2 parents c1febbe + 1fe4591 commit 9438fe3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/cargo/util/context/de.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,11 +531,11 @@ impl<'de, 'gctx> de::MapAccess<'de> for ValueDeserializer<'gctx> {
531531
seed.deserialize(Tuple2Deserializer(1i32, env.as_str()))
532532
}
533533
Definition::Cli(path) => {
534-
let str = path
534+
let s = path
535535
.as_ref()
536536
.map(|p| p.to_string_lossy())
537537
.unwrap_or_default();
538-
seed.deserialize(Tuple2Deserializer(2i32, str))
538+
seed.deserialize(Tuple2Deserializer(2i32, s))
539539
}
540540
}
541541
}

src/cargo/util/interning.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ impl<'a> PartialEq<&'a str> for InternedString {
7272
impl Eq for InternedString {}
7373

7474
impl InternedString {
75-
pub fn new(str: &str) -> InternedString {
76-
InternedString::from_cow(str.into())
75+
pub fn new(s: &str) -> InternedString {
76+
InternedString::from_cow(s.into())
7777
}
7878

79-
fn from_cow<'a>(str: Cow<'a, str>) -> InternedString {
79+
fn from_cow<'a>(cs: Cow<'a, str>) -> InternedString {
8080
let mut cache = interned_storage();
81-
let s = cache.get(str.as_ref()).copied().unwrap_or_else(|| {
82-
let s = str.into_owned().leak();
81+
let s = cache.get(cs.as_ref()).copied().unwrap_or_else(|| {
82+
let s = cs.into_owned().leak();
8383
cache.insert(s);
8484
s
8585
});

0 commit comments

Comments
 (0)