From 4a64d05e864d8994579e4e3b9c6c4a855724bd67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 11 May 2018 16:54:23 +0200 Subject: [PATCH] NFC: fix a couple of typos, found by codespell. --- src/cargo/core/compiler/mod.rs | 2 +- src/cargo/core/package_id_spec.rs | 2 +- src/cargo/core/resolver/types.rs | 4 ++-- src/cargo/core/summary.rs | 2 +- src/cargo/ops/cargo_compile.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index 3353c2e49cd..6d5241e0c9c 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -642,7 +642,7 @@ fn rustdoc<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoResult // if you literally move the whole project wholesale to a new directory. As a // result we mostly don't factor in `cwd` to this calculation. Instead we try to // track the workspace as much as possible and we update the current directory -// of rustc/rustdoc where approrpriate. +// of rustc/rustdoc where appropriate. // // The first returned value here is the argument to pass to rustc, and the // second is the cwd that rustc should operate in. diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs index 43dd9683d6b..8acc65401b6 100644 --- a/src/cargo/core/package_id_spec.rs +++ b/src/cargo/core/package_id_spec.rs @@ -158,7 +158,7 @@ impl PackageIdSpec { self.url = Some(url); } - /// Checkes whether the given `PackageId` matches the `PackageIdSpec`. + /// Checks whether the given `PackageId` matches the `PackageIdSpec`. pub fn matches(&self, package_id: &PackageId) -> bool { if self.name() != &*package_id.name() { return false; diff --git a/src/cargo/core/resolver/types.rs b/src/cargo/core/resolver/types.rs index 1190121dae4..f555d77fb99 100644 --- a/src/cargo/core/resolver/types.rs +++ b/src/cargo/core/resolver/types.rs @@ -15,7 +15,7 @@ pub struct RegistryQueryer<'a> { cache: HashMap>>, // If set the list of dependency candidates will be sorted by minimal // versions first. That allows `cargo update -Z minimal-versions` which will - // specify minimum depedency versions to be used. + // specify minimum dependency versions to be used. minimal_versions: bool, } @@ -283,7 +283,7 @@ pub enum ConflictReason { /// A dependency listed features that weren't actually available on the /// candidate. For example we tried to activate feature `foo` but the - /// candidiate we're activating didn't actually have the feature `foo`. + /// candidate we're activating didn't actually have the feature `foo`. MissingFeatures(String), } diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs index b7c36d8dd68..bd08ffcdacb 100644 --- a/src/cargo/core/summary.rs +++ b/src/cargo/core/summary.rs @@ -323,7 +323,7 @@ fn build_feature_map( /// /// * Another feature /// * An optional dependency -/// * A feature in a depedency +/// * A feature in a dependency /// /// The selection between these 3 things happens as part of the construction of the FeatureValue. #[derive(Clone, Debug)] diff --git a/src/cargo/ops/cargo_compile.rs b/src/cargo/ops/cargo_compile.rs index 62732e5b169..3d5fa2c535f 100644 --- a/src/cargo/ops/cargo_compile.rs +++ b/src/cargo/ops/cargo_compile.rs @@ -170,7 +170,7 @@ pub fn compile<'a>( compile_with_exec(ws, options, Arc::new(DefaultExecutor)) } -/// Like `compile` but allows specifing a custom `Executor` that will be able to intercept build +/// Like `compile` but allows specifying a custom `Executor` that will be able to intercept build /// calls and add custom logic. `compile` uses `DefaultExecutor` which just passes calls through. pub fn compile_with_exec<'a>( ws: &Workspace<'a>,