Auto merge of #7696 - matthiaskrgr:typ0s, r=ehuss

fix a couple of typos

Author: bors

src/bin/cargo/commands/vendor.rs

@@ -68,7 +68,7 @@ to use the vendored sources, which you will need to add to `.cargo/config`.
 }
 
 pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
-    // We're doing the vendoring operation outselves, so we don't actually want
+    // We're doing the vendoring operation ourselves, so we don't actually want
     // to respect any of the `source` configuration in Cargo itself. That's
     // intended for other consumers of Cargo, but we want to go straight to the
     // source, e.g. crates.io, to fetch crates.
@@ -77,7 +77,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
     }
 
     // When we moved `cargo vendor` into Cargo itself we didn't stabilize a few
-    // flags, so try to provide a helpful error message in that case to enusre
+    // flags, so try to provide a helpful error message in that case to ensure
     // that users currently using the flag aren't tripped up.
     let crates_io_cargo_vendor_flag = if args.is_present("no-merge-sources") {
         Some("--no-merge-sources")

src/cargo/core/compiler/fingerprint.rs

@@ -123,7 +123,7 @@
 //!   if we tracked the actual values of modification times would cause
 //!   unnecessary recompiles. To fix this we instead only track paths which are
 //!   relevant. These paths are checked dynamically to see if they're up to
-//!   date, and the modifiation time doesn't make its way into the fingerprint
+//!   date, and the modification time doesn't make its way into the fingerprint
 //!   hash.
 //!
 //! * Absolute path names. We strive to maintain a property where if you rename

src/cargo/core/compiler/mod.rs

@@ -727,7 +727,7 @@ fn build_base_args<'a, 'cfg>(
     if unit.mode.is_check() {
         cmd.arg("--emit=dep-info,metadata");
     } else if !unit.requires_upstream_objects() {
-        // Always produce metdata files for rlib outputs. Metadata may be used
+        // Always produce metadata files for rlib outputs. Metadata may be used
         // in this session for a pipelined compilation, or it may be used in a
         // future Cargo session as part of a pipelined compile.
         cmd.arg("--emit=dep-info,metadata,link");

src/cargo/core/resolver/conflict_cache.rs

@@ -61,7 +61,7 @@ impl ConflictStoreTrie {
                             if max_age > age {
                                 // we found one that can jump-back further so replace the out.
                                 out = Some((o, age));
-                                // and dont look at anything older
+                                // and don't look at anything older
                                 max_age = age
                             }
                         }

src/cargo/core/resolver/context.rs

@@ -398,7 +398,7 @@ impl PublicDependency {
             // for each (transitive) parent that can newly see `t`
             let mut stack = vec![(parent, is_public)];
             while let Some((p, public)) = stack.pop() {
-                // TODO: dont look at the same thing more then once
+                // TODO: don't look at the same thing more then once
                 if let Some(o) = self.inner.get(&p).and_then(|x| x.get(&t.name())) {
                     if o.0 != t {
                         // the (transitive) parent can already see a different version by `t`s name.

src/cargo/core/resolver/dep_cache.rs

@@ -234,7 +234,7 @@ impl<'a> RegistryQueryer<'a> {
         let out = Rc::new((used_features, Rc::new(deps)));
 
         // If we succeed we add the result to the cache so we can use it again next time.
-        // We dont cache the failure cases as they dont impl Clone.
+        // We don't cache the failure cases as they don't impl Clone.
         self.summary_cache
             .insert((parent, candidate.clone(), opts.clone()), out.clone());
 

src/cargo/core/resolver/errors.rs

@@ -271,7 +271,7 @@ pub(super) fn activation_error(
             );
             if !candidates.is_empty() {
                 // If dependency package name is equal to the name of the candidate here
-                // it may be a prerelease package which hasn't been speficied correctly
+                // it may be a prerelease package which hasn't been specified correctly
                 if dep.package_name() == candidates[0].1.name()
                     && candidates[0].1.package_id().version().is_prerelease()
                 {

src/cargo/core/resolver/mod.rs

@@ -868,7 +868,7 @@ fn generalize_conflicting(
                 let mut con = conflicting_activations.clone();
                 // It is always valid to combine previously inserted conflicts.
                 // A, B are both known bad states each that can never be activated.
-                // A + B is redundant but cant be activated, as if
+                // A + B is redundant but can't be activated, as if
                 // A + B is active then A is active and we know that is not ok.
                 for (_, other) in &others {
                     con.extend(other.iter().map(|(&id, re)| (id, re.clone())));
@@ -928,7 +928,7 @@ fn find_candidate(
     // If we backtracked we do not know how our `conflicting_activations` related to
     // the cause of that backtrack, so we do not update it.
     let age = if !backtracked {
-        // we dont have abnormal situations. So we can ask `cx` for how far back we need to go.
+        // we don't have abnormal situations. So we can ask `cx` for how far back we need to go.
         let a = cx.is_conflicting(Some(parent.package_id()), conflicting_activations);
         // If the `conflicting_activations` does not apply to `cx`, then something went very wrong
         // in building it. But we will just fall back to laboriously trying all possibilities witch

src/cargo/ops/cargo_package.rs

@@ -324,7 +324,7 @@ fn check_repo_state(
                 failure::bail!(
                     "{} files in the working directory contain changes that were \
                      not yet committed into git:\n\n{}\n\n\
-                     to proceed despite this and include the uncommited changes, pass the `--allow-dirty` flag",
+                     to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag",
                     dirty.len(),
                     dirty.join("\n")
                 )

src/cargo/sources/registry/mod.rs

@@ -47,7 +47,7 @@
 //!
 //!   Additionally, each modification to the index is just appending a line at
 //!   the end of a file (the exact format is described later). This means that
-//!   the commits for an index are quite small and easily applied/compressable.
+//!   the commits for an index are quite small and easily applied/compressible.
 //!
 //! ## The format of the Index
 //!