Skip to content

Commit fb2f67d

Browse files
committed
chore: Address typos
1 parent 367fd9f commit fb2f67d

File tree

18 files changed

+67
-67
lines changed

18 files changed

+67
-67
lines changed

crates/cargo-test-support/src/paths.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ fn build_dir_ignored_path_patterns() -> Vec<String> {
357357
// Ignore MacOS debug symbols as there are many files/directories that would clutter up
358358
// tests few not a lot of benefit.
359359
"[..].dSYM/[..]",
360-
// Ignore Windows debub symbols files (.pdb)
360+
// Ignore Windows debug symbols files (.pdb)
361361
"[..].pdb",
362362
]
363363
.into_iter()

crates/cargo-util-schemas/src/lockfile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl TomlLockfileSourceId {
110110
.ok_or_else(|| TomlLockfileSourceIdErrorKind::InvalidSource(source.clone()))?;
111111

112112
// Sparse URLs store the kind prefix (sparse+) in the URL. Therefore, for sparse kinds, we
113-
// want to use the raw `source` instead of the splitted `url`.
113+
// want to use the raw `source` instead of the split `url`.
114114
let url = Url::parse(if kind == "sparse" { &source } else { url }).map_err(|msg| {
115115
TomlLockfileSourceIdErrorKind::InvalidUrl {
116116
url: url.to_string(),

src/cargo/core/compiler/build_runner/compilation_files.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,16 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> {
235235
/// Note that some units may share the same directory, so care should be
236236
/// taken in those cases!
237237
fn pkg_dir(&self, unit: &Unit) -> String {
238-
let seperator = match self.ws.gctx().cli_unstable().build_dir_new_layout {
238+
let separator = match self.ws.gctx().cli_unstable().build_dir_new_layout {
239239
true => "/",
240240
false => "-",
241241
};
242242
let name = unit.pkg.package_id().name();
243243
let meta = self.metas[unit];
244244
if let Some(c_extra_filename) = meta.c_extra_filename() {
245-
format!("{}{}{}", name, seperator, c_extra_filename)
245+
format!("{}{}{}", name, separator, c_extra_filename)
246246
} else {
247-
format!("{}{}{}", name, seperator, self.target_short_hash(unit))
247+
format!("{}{}{}", name, separator, self.target_short_hash(unit))
248248
}
249249
}
250250

src/cargo/core/compiler/fingerprint/mod.rs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,18 +1031,18 @@ impl Fingerprint {
10311031
}
10321032
(
10331033
LocalFingerprint::CheckDepInfo {
1034-
dep_info: adep,
1034+
dep_info: a_dep,
10351035
checksum: checksum_a,
10361036
},
10371037
LocalFingerprint::CheckDepInfo {
1038-
dep_info: bdep,
1038+
dep_info: b_dep,
10391039
checksum: checksum_b,
10401040
},
10411041
) => {
1042-
if adep != bdep {
1042+
if a_dep != b_dep {
10431043
return DirtyReason::DepInfoOutputChanged {
1044-
old: bdep.clone(),
1045-
new: adep.clone(),
1044+
old: b_dep.clone(),
1045+
new: a_dep.clone(),
10461046
};
10471047
}
10481048
if checksum_a != checksum_b {
@@ -1051,48 +1051,48 @@ impl Fingerprint {
10511051
}
10521052
(
10531053
LocalFingerprint::RerunIfChanged {
1054-
output: aout,
1055-
paths: apaths,
1054+
output: a_out,
1055+
paths: a_paths,
10561056
},
10571057
LocalFingerprint::RerunIfChanged {
1058-
output: bout,
1059-
paths: bpaths,
1058+
output: b_out,
1059+
paths: b_paths,
10601060
},
10611061
) => {
1062-
if aout != bout {
1062+
if a_out != b_out {
10631063
return DirtyReason::RerunIfChangedOutputFileChanged {
1064-
old: bout.clone(),
1065-
new: aout.clone(),
1064+
old: b_out.clone(),
1065+
new: a_out.clone(),
10661066
};
10671067
}
1068-
if apaths != bpaths {
1068+
if a_paths != b_paths {
10691069
return DirtyReason::RerunIfChangedOutputPathsChanged {
1070-
old: bpaths.clone(),
1071-
new: apaths.clone(),
1070+
old: b_paths.clone(),
1071+
new: a_paths.clone(),
10721072
};
10731073
}
10741074
}
10751075
(
10761076
LocalFingerprint::RerunIfEnvChanged {
1077-
var: akey,
1078-
val: avalue,
1077+
var: a_key,
1078+
val: a_value,
10791079
},
10801080
LocalFingerprint::RerunIfEnvChanged {
1081-
var: bkey,
1082-
val: bvalue,
1081+
var: b_key,
1082+
val: b_value,
10831083
},
10841084
) => {
1085-
if *akey != *bkey {
1085+
if *a_key != *b_key {
10861086
return DirtyReason::EnvVarsChanged {
1087-
old: bkey.clone(),
1088-
new: akey.clone(),
1087+
old: b_key.clone(),
1088+
new: a_key.clone(),
10891089
};
10901090
}
1091-
if *avalue != *bvalue {
1091+
if *a_value != *b_value {
10921092
return DirtyReason::EnvVarChanged {
1093-
name: akey.clone(),
1094-
old_value: bvalue.clone(),
1095-
new_value: avalue.clone(),
1093+
name: a_key.clone(),
1094+
old_value: b_value.clone(),
1095+
new_value: a_value.clone(),
10961096
};
10971097
}
10981098
}

src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ fn build_deps_args(
16751675
if build_runner.bcx.gctx.cli_unstable().build_dir_new_layout {
16761676
let mut map = BTreeMap::new();
16771677

1678-
// Recursively add all depenendency args to rustc process
1678+
// Recursively add all dependency args to rustc process
16791679
add_dep_arg(&mut map, build_runner, unit);
16801680

16811681
let paths = map.into_iter().map(|(_, path)| path).sorted_unstable();

src/cargo/core/compiler/timings.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ impl<'gctx> Timings<'gctx> {
618618
AggregatedSections::Sections(mut sections) => {
619619
// We draw the sections in the pipeline graph in a way where the frontend
620620
// section has the "default" build color, and then additional sections
621-
// (codegen, link) are overlayed on top with a different color.
621+
// (codegen, link) are overlaid on top with a different color.
622622
// However, there might be some time after the final (usually link) section,
623623
// which definitely shouldn't be classified as "Frontend". We thus try to
624624
// detect this situation and add a final "Other" section.

src/cargo/core/shell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ impl Shell {
364364
fn file_hyperlink(&mut self, path: &std::path::Path) -> Option<url::Url> {
365365
let mut url = url::Url::from_file_path(path).ok()?;
366366
// Do a best-effort of setting the host in the URL to avoid issues with opening a link
367-
// scoped to the computer you've SSHed into
367+
// scoped to the computer you've SSH'ed into
368368
let hostname = if cfg!(windows) {
369369
// Not supported correctly on windows
370370
None

src/cargo/core/workspace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ impl<'gctx> Workspace<'gctx> {
13271327

13281328
// This is a short term hack to allow `blanket_hint_mostly_unused`
13291329
// to run without requiring `-Zcargo-lints`, which should hopefully
1330-
// improve the testing expierience while we are collecting feedback
1330+
// improve the testing experience while we are collecting feedback
13311331
if self.gctx.cli_unstable().profile_hint_mostly_unused {
13321332
blanket_hint_mostly_unused(
13331333
self.root_maybe(),

src/cargo/ops/cargo_compile/compile_filter.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ impl CompileFilter {
102102
lib_only: bool,
103103
bins: Vec<String>,
104104
all_bins: bool,
105-
tsts: Vec<String>,
106-
all_tsts: bool,
107-
exms: Vec<String>,
108-
all_exms: bool,
109-
bens: Vec<String>,
110-
all_bens: bool,
105+
tests: Vec<String>,
106+
all_tests: bool,
107+
examples: Vec<String>,
108+
all_examples: bool,
109+
benches: Vec<String>,
110+
all_benches: bool,
111111
all_targets: bool,
112112
) -> CompileFilter {
113113
if all_targets {
@@ -119,34 +119,34 @@ impl CompileFilter {
119119
LibRule::False
120120
};
121121
let rule_bins = FilterRule::new(bins, all_bins);
122-
let rule_tsts = FilterRule::new(tsts, all_tsts);
123-
let rule_exms = FilterRule::new(exms, all_exms);
124-
let rule_bens = FilterRule::new(bens, all_bens);
122+
let rule_tests = FilterRule::new(tests, all_tests);
123+
let rule_examples = FilterRule::new(examples, all_examples);
124+
let rule_benches = FilterRule::new(benches, all_benches);
125125

126-
CompileFilter::new(rule_lib, rule_bins, rule_tsts, rule_exms, rule_bens)
126+
CompileFilter::new(rule_lib, rule_bins, rule_tests, rule_examples, rule_benches)
127127
}
128128

129129
/// Constructs a filter from underlying primitives.
130130
pub fn new(
131131
rule_lib: LibRule,
132132
rule_bins: FilterRule,
133-
rule_tsts: FilterRule,
134-
rule_exms: FilterRule,
135-
rule_bens: FilterRule,
133+
rule_tests: FilterRule,
134+
rule_examples: FilterRule,
135+
rule_benches: FilterRule,
136136
) -> CompileFilter {
137137
if rule_lib == LibRule::True
138138
|| rule_bins.is_specific()
139-
|| rule_tsts.is_specific()
140-
|| rule_exms.is_specific()
141-
|| rule_bens.is_specific()
139+
|| rule_tests.is_specific()
140+
|| rule_examples.is_specific()
141+
|| rule_benches.is_specific()
142142
{
143143
CompileFilter::Only {
144144
all_targets: false,
145145
lib: rule_lib,
146146
bins: rule_bins,
147-
examples: rule_exms,
148-
benches: rule_bens,
149-
tests: rule_tsts,
147+
examples: rule_examples,
148+
benches: rule_benches,
149+
tests: rule_tests,
150150
}
151151
} else {
152152
CompileFilter::Default {

src/cargo/util/context/de.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ impl<'de, 'gctx> de::Deserializer<'de> for Deserializer<'gctx> {
198198
let vals: Vec<String> = res
199199
.into_iter()
200200
.map(|val| match val {
201-
CV::String(s, _defintion) => Ok(s),
201+
CV::String(s, _definition) => Ok(s),
202202
other => Err(ConfigError::expected(&self.key, "string", &other)),
203203
})
204204
.collect::<Result<_, _>>()?;

0 commit comments

Comments
 (0)