Skip to content

Commit

Permalink
Auto merge of #5519 - matthiaskrgr:typos, r=alexcrichton
Browse files Browse the repository at this point in the history
NFC: fix a couple of typos, found by codespell.
  • Loading branch information
bors committed May 11, 2018
2 parents dfaba34 + 4a64d05 commit 2f7cf4a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/package_id_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/core/resolver/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ pub struct RegistryQueryer<'a> {
cache: HashMap<Dependency, Rc<Vec<Candidate>>>,
// 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,
}

Expand Down Expand Up @@ -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),
}

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/summary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down

0 comments on commit 2f7cf4a

Please sign in to comment.