diff --git a/src/bin/search.rs b/src/bin/search.rs index 23a656c0653..fabfdf402f6 100644 --- a/src/bin/search.rs +++ b/src/bin/search.rs @@ -6,7 +6,7 @@ use std::cmp; #[derive(Deserialize)] pub struct Options { flag_index: Option, - flag_host: Option, // TODO: Depricated, remove + flag_host: Option, // TODO: Deprecated, remove flag_verbose: u32, flag_quiet: Option, flag_color: Option, @@ -49,7 +49,7 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult { &options.flag_z)?; let Options { flag_index: index, - flag_host: host, // TODO: Depricated, remove + flag_host: host, // TODO: Deprecated, remove flag_limit: limit, arg_query: query, flag_registry: registry, @@ -61,7 +61,7 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult { requires -Zunstable-options to use.").into()) } - // TODO: Depricated + // TODO: Deprecated // remove once it has been decided --host can be safely removed // We may instead want to repurpose the host flag, as // mentioned in this issue @@ -70,7 +70,7 @@ pub fn execute(options: Options, config: &mut Config) -> CliResult { let msg = "The flag '--host' is no longer valid. Previous versions of Cargo accepted this flag, but it is being -depricated. The flag is being renamed to 'index', as the flag +deprecated. The flag is being renamed to 'index', as the flag wants the location of the index in which to search. Please use '--index' instead. diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs index 6e8e4480679..72ac61625c4 100644 --- a/src/cargo/core/package.rs +++ b/src/cargo/core/package.rs @@ -95,7 +95,7 @@ impl Package { pub fn manifest_path(&self) -> &Path { &self.manifest_path } /// Get the name of the package pub fn name(&self) -> &str { self.package_id().name() } - /// Get the PackageId object for the package (fully defines a packge) + /// Get the PackageId object for the package (fully defines a package) pub fn package_id(&self) -> &PackageId { self.manifest.package_id() } /// Get the root folder of the package pub fn root(&self) -> &Path { self.manifest_path.parent().unwrap() } diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs index 02a26a9f79c..dc109191d0b 100644 --- a/src/cargo/core/resolver/mod.rs +++ b/src/cargo/core/resolver/mod.rs @@ -620,7 +620,7 @@ fn activate_deps_loop<'a>(mut cx: Context<'a>, // You'll note that a few stacks are maintained on the side, which might // seem odd when this algorithm looks like it could be implemented // recursively. While correct, this is implemented iteratively to avoid - // blowing the stack (the recusion depth is proportional to the size of the + // blowing the stack (the recursion depth is proportional to the size of the // input). // // The general sketch of this loop is to run until there are no dependencies @@ -1073,7 +1073,7 @@ impl<'a> Context<'a> { registry: &mut Registry, candidate: &Summary, method: &Method) -> CargoResult> { - // First, figure out our set of dependencies based on the requsted set + // First, figure out our set of dependencies based on the requested set // of features. This also calculates what features we're going to enable // for our own dependencies. let deps = self.resolve_features(candidate, method)?; diff --git a/src/cargo/core/summary.rs b/src/cargo/core/summary.rs index 734f73bd63b..8082c3c76a4 100644 --- a/src/cargo/core/summary.rs +++ b/src/cargo/core/summary.rs @@ -7,7 +7,7 @@ use core::{Dependency, PackageId, SourceId}; use util::CargoResult; -/// Subset of a `Manifest`. Contains only the most important informations about +/// Subset of a `Manifest`. Contains only the most important information about /// a package. /// /// Summaries are cloned, and should not be mutated after creation diff --git a/src/cargo/ops/cargo_rustc/context.rs b/src/cargo/ops/cargo_rustc/context.rs index 670ae998506..f9c0cec873d 100644 --- a/src/cargo/ops/cargo_rustc/context.rs +++ b/src/cargo/ops/cargo_rustc/context.rs @@ -41,7 +41,7 @@ use super::{Kind, Compilation, BuildConfig}; /// all that out. #[derive(Clone, Copy, Eq, PartialEq, Hash)] pub struct Unit<'a> { - /// Information about avaiable targets, which files to include/exclude, etc. Basically stuff in + /// Information about available targets, which files to include/exclude, etc. Basically stuff in /// `Cargo.toml`. pub pkg: &'a Package, /// Information about the specific target to build, out of the possible targets in `pkg`. Not diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 18bfbf519a5..9148ccb0f89 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -97,10 +97,10 @@ impl<'cfg> PathSource<'cfg> { /// 1) Only warn users about the future change iff their matching rules are /// affected. (CURRENT STAGE) /// - /// 2) Switch to the new strategy and upate documents. Still keep warning + /// 2) Switch to the new strategy and update documents. Still keep warning /// affected users. /// - /// 3) Drop the old strategy and no mor warnings. + /// 3) Drop the old strategy and no more warnings. /// /// See for more info. pub fn list_files(&self, pkg: &Package) -> CargoResult> { diff --git a/src/cargo/sources/registry/index.rs b/src/cargo/sources/registry/index.rs index f2e9932443d..23d3362c513 100644 --- a/src/cargo/sources/registry/index.rs +++ b/src/cargo/sources/registry/index.rs @@ -177,7 +177,7 @@ impl<'cfg> RegistryIndex<'cfg> { // Handle `cargo update --precise` here. If specified, our own source // will have a precise version listed of the form `=` where // `` is the name of a crate on this source and `` is the - // version requested (agument to `--precise`). + // version requested (argument to `--precise`). let summaries = summaries.filter(|s| { match source_id.precise() { Some(p) if p.starts_with(dep.name()) && diff --git a/tests/cargotest/lib.rs b/tests/cargotest/lib.rs index db7b9020edf..b29fde3f884 100644 --- a/tests/cargotest/lib.rs +++ b/tests/cargotest/lib.rs @@ -46,8 +46,8 @@ fn _process(t: &OsStr) -> cargo::util::ProcessBuilder { .env("__CARGO_TEST_ROOT", support::paths::root()) // Force cargo to think it's on the stable channel for all tests, this - // should hopefully not suprise us as we add cargo features over time and - // cargo rides the trains + // should hopefully not surprise us as we add cargo features over time and + // cargo rides the trains. .env("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS", "stable") // For now disable incremental by default as support hasn't ridden to the diff --git a/tests/cargotest/support/mod.rs b/tests/cargotest/support/mod.rs index c513d57b16e..099e39d1892 100644 --- a/tests/cargotest/support/mod.rs +++ b/tests/cargotest/support/mod.rs @@ -563,7 +563,7 @@ impl Execs { } {} ham::expect(matches == number, - format!("expected to find {} occurences:\n\ + format!("expected to find {} occurrences:\n\ {}\n\n\ did not find in output:\n\ {}", number, out, diff --git a/tests/death.rs b/tests/death.rs index 33d6f573d97..3f80e406cbb 100644 --- a/tests/death.rs +++ b/tests/death.rs @@ -17,7 +17,7 @@ fn enabled() -> bool { true } -// On Windows suport for these tests is only enabled through the usage of job +// On Windows support for these tests is only enabled through the usage of job // objects. Support for nested job objects, however, was added in recent-ish // versions of Windows, so this test may not always be able to succeed. // diff --git a/tests/search.rs b/tests/search.rs index 028f7f52b70..4b407739c94 100644 --- a/tests/search.rs +++ b/tests/search.rs @@ -88,7 +88,7 @@ fn simple() { hoare = \"0.1.1\" # Design by contract style assertions for Rust")); } -// TODO: Depricated +// TODO: Deprecated // remove once it has been decided '--host' can be safely removed #[test] fn simple_with_host() { @@ -140,7 +140,7 @@ fn simple_with_host() { [WARNING] The flag '--host' is no longer valid. Previous versions of Cargo accepted this flag, but it is being -depricated. The flag is being renamed to 'index', as the flag +deprecated. The flag is being renamed to 'index', as the flag wants the location of the index in which to search. Please use '--index' instead. @@ -154,7 +154,7 @@ about this warning. hoare = \"0.1.1\" # Design by contract style assertions for Rust")); } -// TODO: Depricated +// TODO: Deprecated // remove once it has been decided '--host' can be safely removed #[test] fn simple_with_index_and_host() { @@ -207,7 +207,7 @@ fn simple_with_index_and_host() { [WARNING] The flag '--host' is no longer valid. Previous versions of Cargo accepted this flag, but it is being -depricated. The flag is being renamed to 'index', as the flag +deprecated. The flag is being renamed to 'index', as the flag wants the location of the index in which to search. Please use '--index' instead.