fixed a few typos

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 0e123ded5f6d7da90c95797f5c82b1cdc81e6722..fdb9aee304cc02188cc08dfb8fc16988173f1d0c 100644 (file)
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -776,7 +776,7 @@ impl RemainingCandidates {
 
         // Alright we've entirely exhausted our list of candidates. If we've got
         // something stashed away return that here (also indicating that there's
-        // nothign else). If nothing is stashed away we return the list of all
+        // nothing else). If nothing is stashed away we return the list of all
         // conflicting activations, if any.
         //
         // TODO: can the `conflicting_prev_active` clone be avoided here? should

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
index 9377b185cf7864b9c30a1c13e72cc037fb406d22..7bb9be948b023c2574a1258e9afbac2cc141ea4f 100644 (file)
--- a/src/cargo/core/workspace.rs
+++ b/src/cargo/core/workspace.rs
@@ -72,7 +72,7 @@ pub struct Workspace<'cfg> {
     // cases `false` also results in the non-enforcement of dev-dependencies.
     require_optional_deps: bool,
 
-    // A cache of lodaed packages for particular paths which is disjoint from
+    // A cache of loaded packages for particular paths which is disjoint from
     // `packages` up above, used in the `load` method down below.
     loaded_packages: RefCell<HashMap<PathBuf, Package>>,
 }

diff --git a/src/cargo/ops/cargo_rustc/fingerprint.rs b/src/cargo/ops/cargo_rustc/fingerprint.rs
index 5208874cea5d5ec3c6da07a156d2852f5dd65d58..d4b5e4ee7df53d04746fddc6ca762530d6aa7711 100644 (file)
--- a/src/cargo/ops/cargo_rustc/fingerprint.rs
+++ b/src/cargo/ops/cargo_rustc/fingerprint.rs
@@ -787,7 +787,7 @@ fn filename<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> String {
 /// when it was invoked.
 ///
 /// The serialized Cargo format will contain a list of files, all of which are
-/// relative if they're under `root`. or absolute if they're elsewehre.
+/// relative if they're under `root`. or absolute if they're elsewhere.
 pub fn translate_dep_info(
     rustc_dep_info: &Path,
     cargo_dep_info: &Path,

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 433c97d9f03a4979a0d60c2c3bda581f02275f07..cadb0cffa172149e7043f73729a5f39731e6e2e2 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -443,7 +443,7 @@ impl<'cfg> PathSource<'cfg> {
         // For package integration tests, we need to sort the paths in a deterministic order to
         // be able to match stdout warnings in the same order.
         //
-        // TODO: Drop collect and sort after transition period and dropping wraning tests.
+        // TODO: Drop collect and sort after transition period and dropping warning tests.
         // See <https://github.com/rust-lang/cargo/issues/4268>
         // and <https://github.com/rust-lang/cargo/pull/4270>
         let mut entries: Vec<fs::DirEntry> = fs::read_dir(path)?.map(|e| e.unwrap()).collect();

diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
index 59aee06324a15c1b26a1c35ccca7557d7aab4dd5..af8f5cc7f4111a06029185e087647fd730fce2dd 100644 (file)
--- a/tests/testsuite/build_script.rs
+++ b/tests/testsuite/build_script.rs
@@ -2759,7 +2759,7 @@ fn rebuild_only_on_explicit_paths() {
 }
 
 #[test]
-fn doctest_recieves_build_link_args() {
+fn doctest_receives_build_link_args() {
     let p = project("foo")
         .file(
             "Cargo.toml",

diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs
index d764cc2a3d8fba446608b50eb823224ad6782e7f..f1f5f54fb46d02a57af5bc286b8fb2dfc588745e 100644 (file)
--- a/tests/testsuite/git.rs
+++ b/tests/testsuite/git.rs
@@ -161,7 +161,7 @@ fn cargo_compile_offline_with_cached_git_dep() {
     let rev2 = git::commit(&repo);
 
     {
-        // cache to regisrty rev1 and rev2
+        // cache to registry rev1 and rev2
         let prj = project("cache_git_dep")
             .file(
                 "Cargo.toml",