Skip to content

Commit 2f7cf4a

Browse files
committed
Auto merge of #5519 - matthiaskrgr:typos, r=alexcrichton
NFC: fix a couple of typos, found by codespell.
2 parents dfaba34 + 4a64d05 commit 2f7cf4a

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

src/cargo/core/compiler/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult
642642
// if you literally move the whole project wholesale to a new directory. As a
643643
// result we mostly don't factor in `cwd` to this calculation. Instead we try to
644644
// track the workspace as much as possible and we update the current directory
645-
// of rustc/rustdoc where approrpriate.
645+
// of rustc/rustdoc where appropriate.
646646
//
647647
// The first returned value here is the argument to pass to rustc, and the
648648
// second is the cwd that rustc should operate in.

src/cargo/core/package_id_spec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl PackageIdSpec {
158158
self.url = Some(url);
159159
}
160160

161-
/// Checkes whether the given `PackageId` matches the `PackageIdSpec`.
161+
/// Checks whether the given `PackageId` matches the `PackageIdSpec`.
162162
pub fn matches(&self, package_id: &PackageId) -> bool {
163163
if self.name() != &*package_id.name() {
164164
return false;

src/cargo/core/resolver/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub struct RegistryQueryer<'a> {
1515
cache: HashMap<Dependency, Rc<Vec<Candidate>>>,
1616
// If set the list of dependency candidates will be sorted by minimal
1717
// versions first. That allows `cargo update -Z minimal-versions` which will
18-
// specify minimum depedency versions to be used.
18+
// specify minimum dependency versions to be used.
1919
minimal_versions: bool,
2020
}
2121

@@ -283,7 +283,7 @@ pub enum ConflictReason {
283283

284284
/// A dependency listed features that weren't actually available on the
285285
/// candidate. For example we tried to activate feature `foo` but the
286-
/// candidiate we're activating didn't actually have the feature `foo`.
286+
/// candidate we're activating didn't actually have the feature `foo`.
287287
MissingFeatures(String),
288288
}
289289

src/cargo/core/summary.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ fn build_feature_map(
323323
///
324324
/// * Another feature
325325
/// * An optional dependency
326-
/// * A feature in a depedency
326+
/// * A feature in a dependency
327327
///
328328
/// The selection between these 3 things happens as part of the construction of the FeatureValue.
329329
#[derive(Clone, Debug)]

src/cargo/ops/cargo_compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ pub fn compile<'a>(
170170
compile_with_exec(ws, options, Arc::new(DefaultExecutor))
171171
}
172172

173-
/// Like `compile` but allows specifing a custom `Executor` that will be able to intercept build
173+
/// Like `compile` but allows specifying a custom `Executor` that will be able to intercept build
174174
/// calls and add custom logic. `compile` uses `DefaultExecutor` which just passes calls through.
175175
pub fn compile_with_exec<'a>(
176176
ws: &Workspace<'a>,

0 commit comments

Comments
 (0)