From e4e10f2393847071b5b35531cf182eb019edd281 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 19 Sep 2023 15:28:38 -0500 Subject: [PATCH] chore: Fix typos This is a repeat of #11561 --- CHANGELOG.md | 8 ++++---- crates/crates-io/lib.rs | 2 +- crates/xtask-bump-check/src/xtask.rs | 4 ++-- src/bin/cargo/cli.rs | 4 ++-- src/cargo/core/compiler/context/compilation_files.rs | 2 +- src/cargo/core/compiler/custom_build.rs | 4 ++-- src/cargo/core/compiler/fingerprint/mod.rs | 4 ++-- src/cargo/core/compiler/mod.rs | 4 ++-- src/cargo/core/features.rs | 2 +- src/cargo/core/registry.rs | 2 +- src/cargo/lib.rs | 2 +- src/cargo/ops/cargo_output_metadata.rs | 2 +- src/cargo/sources/git/mod.rs | 2 +- src/cargo/sources/git/oxide.rs | 2 +- src/cargo/sources/git/source.rs | 2 +- src/cargo/sources/git/utils.rs | 8 ++++---- src/cargo/sources/mod.rs | 2 +- src/cargo/sources/registry/index.rs | 4 ++-- src/cargo/sources/registry/remote.rs | 2 +- src/cargo/util/config/key.rs | 2 +- src/cargo/util/mod.rs | 4 ++-- src/cargo/util/semver_ext.rs | 4 ++-- src/doc/man/cargo-metadata.md | 2 +- src/doc/man/generated_txt/cargo-metadata.txt | 2 +- src/doc/src/commands/cargo-metadata.md | 2 +- src/doc/src/guide/continuous-integration.md | 2 +- src/doc/src/reference/registry-authentication.md | 4 ++-- src/etc/man/cargo-metadata.1 | 2 +- tests/testsuite/cargo_new/mod.rs | 2 +- .../in/Cargo.toml | 0 .../in/README.md | 0 .../in/src/lib.rs | 0 .../mod.rs | 0 .../out/Cargo.toml | 0 .../out/foo/Cargo.toml | 0 .../out/foo/src/main.rs | 0 .../out/src/lib.rs | 0 .../stderr.log | 0 .../stdout.log | 0 tests/testsuite/credential_process.rs | 2 +- tests/testsuite/freshness.rs | 4 ++-- tests/testsuite/profile_config.rs | 2 +- tests/testsuite/script.rs | 2 +- 43 files changed, 49 insertions(+), 49 deletions(-) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/in/Cargo.toml (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/in/README.md (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/in/src/lib.rs (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/mod.rs (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/out/Cargo.toml (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/out/foo/Cargo.toml (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/out/foo/src/main.rs (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/out/src/lib.rs (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/stderr.log (100%) rename tests/testsuite/cargo_new/{not_inherit_workspace_package_table_if_not_memebers => not_inherit_workspace_package_table_if_not_members}/stdout.log (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38bb826b0d3..f2c9bd0ebf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -429,7 +429,7 @@ [#10877](https://github.com/rust-lang/cargo/pull/10877) - SemVer: It is not a breaking change to make an unsafe function safe. [#12116](https://github.com/rust-lang/cargo/pull/12116) -- SemVer: changeing MSRV is generally a minor change. +- SemVer: changing MSRV is generally a minor change. [#12122](https://github.com/rust-lang/cargo/pull/12122) - Clarify when and how to `cargo yank`. [#11862](https://github.com/rust-lang/cargo/pull/11862) @@ -728,9 +728,9 @@ - Clarified the difference between `CARGO_CRATE_NAME` and `CARGO_PKG_NAME`. [#11576](https://github.com/rust-lang/cargo/pull/11576) -- Added links to the Target section of the glossary for occurences of target triple. +- Added links to the Target section of the glossary for occurrences of target triple. [#11603](https://github.com/rust-lang/cargo/pull/11603) -- Described how the current resolver sometimes duplicates depenencies. +- Described how the current resolver sometimes duplicates dependencies. [#11604](https://github.com/rust-lang/cargo/pull/11604) - Added a note about verifying your email address on crates.io. [#11620](https://github.com/rust-lang/cargo/pull/11620) @@ -889,7 +889,7 @@ ### Nightly only -- Implemented a inital support of asymmetric token authentication for registries. +- Implemented a initial support of asymmetric token authentication for registries. ([RFC 3231](https://github.com/rust-lang/rfcs/blob/master/text/3231-cargo-asymmetric-tokens.md)) ([docs](https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#registry-auth)) [#10771](https://github.com/rust-lang/cargo/pull/10771) diff --git a/crates/crates-io/lib.rs b/crates/crates-io/lib.rs index 344e6e5c33f..757241fd344 100644 --- a/crates/crates-io/lib.rs +++ b/crates/crates-io/lib.rs @@ -142,7 +142,7 @@ pub enum Error { #[error(transparent)] Curl(#[from] curl::Error), - /// Error from seriailzing the request payload and deserialzing the + /// Error from seriailzing the request payload and deserializing the /// response body (like response body didn't match expected structure). #[error(transparent)] Json(#[from] serde_json::Error), diff --git a/crates/xtask-bump-check/src/xtask.rs b/crates/xtask-bump-check/src/xtask.rs index 5af9491bb55..4bf3f03d5af 100644 --- a/crates/xtask-bump-check/src/xtask.rs +++ b/crates/xtask-bump-check/src/xtask.rs @@ -161,7 +161,7 @@ fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoRes ]; // Even when we test against baseline-rev, we still need to make sure a - // change doesn't violate SemVer rules aginst crates.io releases. The + // change doesn't violate SemVer rules against crates.io releases. The // possibility of this happening is nearly zero but no harm to check twice. let mut cmd = ProcessBuilder::new("cargo"); cmd.arg("semver-checks") @@ -397,7 +397,7 @@ fn check_crates_io<'a>( Ok(()) } -/// Checkouts a temporary workspace to do further version comparsions. +/// Checkouts a temporary workspace to do further version comparisons. fn checkout_ws<'cfg, 'a>( ws: &Workspace<'cfg>, repo: &'a git2::Repository, diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index ade9602c56e..06b4a20e231 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -314,7 +314,7 @@ For more information, see issue #10049 ." ))?; @@ -449,7 +449,7 @@ impl Exec { if !config.cli_unstable().script && ext_path.is_some() { config.shell().warn(format_args!( "\ -external subcommand `{cmd}` has the appearance of a manfiest-command +external subcommand `{cmd}` has the appearance of a manifest-command This was previously accepted but will be phased out when `-Zscript` is stabilized. For more information, see issue #12207 .", ))?; diff --git a/src/cargo/core/compiler/context/compilation_files.rs b/src/cargo/core/compiler/context/compilation_files.rs index 126e1711272..d83dbf10cd1 100644 --- a/src/cargo/core/compiler/context/compilation_files.rs +++ b/src/cargo/core/compiler/context/compilation_files.rs @@ -547,7 +547,7 @@ impl<'a, 'cfg: 'a> CompilationFiles<'a, 'cfg> { /// Gets the metadata hash for the given [`Unit`]. /// -/// Whne a metadata hash doesn't exist for the given unit, +/// When a metadata hash doesn't exist for the given unit, /// this calls itself recursively to compute metadata hashes of all its dependencies. /// See [`compute_metadata`] for how a single metadata hash is computed. fn metadata_of<'a>( diff --git a/src/cargo/core/compiler/custom_build.rs b/src/cargo/core/compiler/custom_build.rs index df658e95e5a..3eeeaa0ee1e 100644 --- a/src/cargo/core/compiler/custom_build.rs +++ b/src/cargo/core/compiler/custom_build.rs @@ -240,7 +240,7 @@ fn emit_build_output( /// /// The construction includes: /// -/// * Set environment varibles for the build script run. +/// * Set environment variables for the build script run. /// * Create the output dir (`OUT_DIR`) for the build script output. /// * Determine if the build script needs a re-run. /// * Run the build script and store its output. @@ -827,7 +827,7 @@ impl BuildOutput { None => return false, Some(n) => n, }; - // ALLOWED: the process of rustc boostrapping reads this through + // ALLOWED: the process of rustc bootstrapping reads this through // `std::env`. We should make the behavior consistent. Also, we // don't advertise this for bypassing nightly. #[allow(clippy::disallowed_methods)] diff --git a/src/cargo/core/compiler/fingerprint/mod.rs b/src/cargo/core/compiler/fingerprint/mod.rs index 08474448083..b1040be41b8 100644 --- a/src/cargo/core/compiler/fingerprint/mod.rs +++ b/src/cargo/core/compiler/fingerprint/mod.rs @@ -1764,7 +1764,7 @@ fn compare_old_fingerprint( /// Logs the result of fingerprint comparison. /// -/// TODO: Obsolete and mostly superceded by [`DirtyReason`]. Could be removed. +/// TODO: Obsolete and mostly superseded by [`DirtyReason`]. Could be removed. fn log_compare(unit: &Unit, compare: &CargoResult>) { match compare { Ok(None) => {} @@ -1820,7 +1820,7 @@ pub fn parse_dep_info( Ok(Some(ret)) } -/// Calcuates the fingerprint of a unit thats contains no dep-info files. +/// Calculates the fingerprint of a unit thats contains no dep-info files. fn pkg_fingerprint(bcx: &BuildContext<'_, '_>, pkg: &Package) -> CargoResult { let source_id = pkg.package_id().source_id(); let sources = bcx.packages.sources(); diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index 9508a0804d1..5da3a908ed8 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -11,7 +11,7 @@ //! like what rustc has done[^1]. Also, no one knows if Cargo really needs that. //! To be pragmatic, here we list a handful of items you may want to learn: //! -//! * [`BuildContext`] is a static context containg all information you need +//! * [`BuildContext`] is a static context containing all information you need //! before a build gets started. //! * [`Context`] is the center of the world, coordinating a running build and //! collecting information from it. @@ -19,7 +19,7 @@ //! * [`fingerprint`] not only defines but also executes a set of rules to //! determine if a re-compile is needed. //! * [`job_queue`] is where the parallelism, job scheduling, and communication -//! machinary happen between Cargo and the compiler. +//! machinery happen between Cargo and the compiler. //! * [`layout`] defines and manages output artifacts of a build in the filesystem. //! * [`unit_dependencies`] is for building a dependency graph for compilation //! from a result of dependency resolution. diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index d86f3dfc454..d99f0cbbe26 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -1209,7 +1209,7 @@ pub fn channel() -> String { if let Ok(override_channel) = env::var("__CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS") { return override_channel; } - // ALLOWED: the process of rustc boostrapping reads this through + // ALLOWED: the process of rustc bootstrapping reads this through // `std::env`. We should make the behavior consistent. Also, we // don't advertise this for bypassing nightly. #[allow(clippy::disallowed_methods)] diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 2bb19fc6f23..9a6a5a035a5 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -399,7 +399,7 @@ impl<'cfg> PackageRegistry<'cfg> { // Note that this is somewhat subtle where the list of `ids` for a // canonical URL is extend with possibly two ids per summary. This is done // to handle the transition from the v2->v3 lock file format where in - // v2 DefeaultBranch was either DefaultBranch or Branch("master") for + // v2 DefaultBranch was either DefaultBranch or Branch("master") for // git dependencies. In this case if `summary.package_id()` is // Branch("master") then alt_package_id will be DefaultBranch. This // signifies that there's a patch available for either of those diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index d0761295fca..908ff4ecc38 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -7,7 +7,7 @@ //! - : targeted at cargo contributors //! - Updated on each update of the `cargo` submodule in `rust-lang/rust` //! -//! **WARNING:** Using Cargo as a library has drawbacks, particulary the API is unstable, +//! **WARNING:** Using Cargo as a library has drawbacks, particularly the API is unstable, //! and there is no clear path to stabilize it soon at the time of writing. See [The Cargo Book: //! External tools] for more on this topic. //! diff --git a/src/cargo/ops/cargo_output_metadata.rs b/src/cargo/ops/cargo_output_metadata.rs index c59e3bc3a01..83dae50ea8d 100644 --- a/src/cargo/ops/cargo_output_metadata.rs +++ b/src/cargo/ops/cargo_output_metadata.rs @@ -316,7 +316,7 @@ fn build_resolve_graph_r( dep_kinds, }, // No lib or artifact dep exists. - // Ususally this mean parent depending on non-lib bin crate. + // Usually this mean parent depending on non-lib bin crate. (None, _) => continue, }; diff --git a/src/cargo/sources/git/mod.rs b/src/cargo/sources/git/mod.rs index 5d9d2886e26..4c01016c249 100644 --- a/src/cargo/sources/git/mod.rs +++ b/src/cargo/sources/git/mod.rs @@ -2,7 +2,7 @@ //! //! Apparently, the most important type in this module is [`GitSource`]. //! [`utils`] provides libgit2 utilities like fetch and checkout, whereas -//! [`oxide`] is the couterpart for gitoxide integration. [`known_hosts`] +//! [`oxide`] is the counterpart for gitoxide integration. [`known_hosts`] //! is the mitigation of [CVE-2022-46176]. //! //! [CVE-2022-46176]: https://blog.rust-lang.org/2023/01/10/cve-2022-46176.html diff --git a/src/cargo/sources/git/oxide.rs b/src/cargo/sources/git/oxide.rs index ec4fcecdd67..5fccdd0c6e6 100644 --- a/src/cargo/sources/git/oxide.rs +++ b/src/cargo/sources/git/oxide.rs @@ -353,7 +353,7 @@ pub fn cargo_config_to_gitoxide_overrides(config: &Config) -> CargoResult CargoResult<()> { fn init(path: &Path, bare: bool) -> CargoResult<()> { diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs index a9b37e10d54..7af342f4505 100644 --- a/src/cargo/sources/git/source.rs +++ b/src/cargo/sources/git/source.rs @@ -73,7 +73,7 @@ pub struct GitSource<'cfg> { source_id: SourceId, /// The underlying path source to discover packages inside the Git repository. path_source: Option>, - /// The identifer of this source for Cargo's Git cache directory. + /// The identifier of this source for Cargo's Git cache directory. /// See [`ident`] for more. ident: String, config: &'cfg Config, diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs index 2422bf631be..74690d30c7b 100644 --- a/src/cargo/sources/git/utils.rs +++ b/src/cargo/sources/git/utils.rs @@ -264,7 +264,7 @@ impl<'a> GitCheckout<'a> { /// is done. Use [`GitCheckout::is_fresh`] to check. /// /// * The `database` is where this checkout is from. - /// * The `repo` will be the checked out Git repoistory. + /// * The `repo` will be the checked out Git repository. fn new( database: &'a GitDatabase, revision: git2::Oid, @@ -394,7 +394,7 @@ impl<'a> GitCheckout<'a> { fn update_submodules(&self, cargo_config: &Config) -> CargoResult<()> { return update_submodules(&self.repo, cargo_config, self.remote_url().as_str()); - /// Recusive helper for [`GitCheckout::update_submodules`]. + /// Recursive helper for [`GitCheckout::update_submodules`]. fn update_submodules( repo: &git2::Repository, cargo_config: &Config, @@ -1086,7 +1086,7 @@ pub fn fetch( debug!("fetch failed: {}", err); if !repo_reinitialized.load(Ordering::Relaxed) - // We check for errors that could occour if the configuration, refs or odb files are corrupted. + // We check for errors that could occur if the configuration, refs or odb files are corrupted. // We don't check for errors related to writing as `gitoxide` is expected to create missing leading // folder before writing files into it, or else not even open a directory as git repository (which is // also handled here). @@ -1331,7 +1331,7 @@ fn clean_repo_temp_files(repo: &git2::Repository) { } } -/// Reinitializes a given Git repository. This is useful when a Git repoistory +/// Reinitializes a given Git repository. This is useful when a Git repository /// seems corrupted and we want to start over. fn reinitialize(repo: &mut git2::Repository) -> CargoResult<()> { // Here we want to drop the current repository object pointed to by `repo`, diff --git a/src/cargo/sources/mod.rs b/src/cargo/sources/mod.rs index 6cdfcd3edc5..7da1d652d2e 100644 --- a/src/cargo/sources/mod.rs +++ b/src/cargo/sources/mod.rs @@ -1,4 +1,4 @@ -//! The trait for sources of Cargo packages and its built-in implemetations. +//! The trait for sources of Cargo packages and its built-in implementations. //! //! A source is a provider that contains source files and metadata of packages. //! It provides a number of methods to fetch those package information, for diff --git a/src/cargo/sources/registry/index.rs b/src/cargo/sources/registry/index.rs index dc176fd800e..ca1cf40693f 100644 --- a/src/cargo/sources/registry/index.rs +++ b/src/cargo/sources/registry/index.rs @@ -323,7 +323,7 @@ struct SummariesCache<'a> { /// A single line in the index representing a single version of a package. #[derive(Deserialize)] pub struct IndexPackage<'a> { - /// Name of the pacakge. + /// Name of the package. name: InternedString, /// The version of this dependency. vers: Version, @@ -522,7 +522,7 @@ impl<'cfg> RegistryIndex<'cfg> { /// The actual kind index file being parsed depends on which kind of /// [`RegistryData`] the `load` argument is given. For example, a /// Git-based [`RemoteRegistry`] will first try a on-disk index cache - /// file, and then try parsing registry raw index fomr Git repository. + /// file, and then try parsing registry raw index from Git repository. /// /// In effect, this is intended to be a quite cheap operation. /// diff --git a/src/cargo/sources/registry/remote.rs b/src/cargo/sources/registry/remote.rs index d4b5d67103f..39eb14dc083 100644 --- a/src/cargo/sources/registry/remote.rs +++ b/src/cargo/sources/registry/remote.rs @@ -59,7 +59,7 @@ pub struct RemoteRegistry<'cfg> { /// A Git [tree object] to help this registry find crate metadata from the /// underlying Git repository. /// - /// This is stored here to prevent Git from repeatly creating a tree object + /// This is stored here to prevent Git from repeatedly creating a tree object /// during each call into `load()`. /// /// [tree object]: https://git-scm.com/book/en/v2/Git-Internals-Git-Objects#_tree_objects diff --git a/src/cargo/util/config/key.rs b/src/cargo/util/config/key.rs index 228d8584484..cd19011403b 100644 --- a/src/cargo/util/config/key.rs +++ b/src/cargo/util/config/key.rs @@ -49,7 +49,7 @@ impl ConfigKey { /// equivalent to accessing a sub-table in TOML. /// /// Note that this considers `name` to be case-insensitive, meaning that the - /// corrseponding toml key is appended with this `name` as-is and the + /// corresponding toml key is appended with this `name` as-is and the /// corresponding env key is appended with `name` after transforming it to /// uppercase characters. pub fn push(&mut self, name: &str) { diff --git a/src/cargo/util/mod.rs b/src/cargo/util/mod.rs index 5c0393f9f1d..b4d14f038fc 100644 --- a/src/cargo/util/mod.rs +++ b/src/cargo/util/mod.rs @@ -161,7 +161,7 @@ pub fn try_canonicalize>(path: P) -> std::io::Result { // On Windows `canonicalize` may fail, so we fall back to getting an absolute path. std::fs::canonicalize(&path).or_else(|_| { - // Return an error if a file does not exist for better compatiblity with `canonicalize` + // Return an error if a file does not exist for better compatibility with `canonicalize` if !path.as_ref().try_exists()? { return Err(Error::new(ErrorKind::NotFound, "the path was not found")); } @@ -224,7 +224,7 @@ pub fn get_umask() -> u32 { use std::sync::OnceLock; static UMASK: OnceLock = OnceLock::new(); // SAFETY: Syscalls are unsafe. Calling `umask` twice is even unsafer for - // multithreading program, since it doesn't provide a way to retrive the + // multithreading program, since it doesn't provide a way to retrieve the // value without modifications. We use a static `OnceLock` here to ensure // it only gets call once during the entire program lifetime. *UMASK.get_or_init(|| unsafe { diff --git a/src/cargo/util/semver_ext.rs b/src/cargo/util/semver_ext.rs index 1ed12fbf519..bee3b2da3eb 100644 --- a/src/cargo/util/semver_ext.rs +++ b/src/cargo/util/semver_ext.rs @@ -244,9 +244,9 @@ impl std::str::FromStr for PartialVersion { } Err(_) => anyhow::bail!("expected a version like \"1.32\""), }; - assert_eq!(version_req.comparators.len(), 1, "guarenteed by is_req"); + assert_eq!(version_req.comparators.len(), 1, "guaranteed by is_req"); let comp = version_req.comparators.pop().unwrap(); - assert_eq!(comp.op, semver::Op::Caret, "guarenteed by is_req"); + assert_eq!(comp.op, semver::Op::Caret, "guaranteed by is_req"); let pre = if comp.pre.is_empty() { None } else { diff --git a/src/doc/man/cargo-metadata.md b/src/doc/man/cargo-metadata.md index 8efb29a97f7..b7d04530d4b 100644 --- a/src/doc/man/cargo-metadata.md +++ b/src/doc/man/cargo-metadata.md @@ -27,7 +27,7 @@ for a Rust API for reading the metadata. Within the same output format version, the compatibility is maintained, except some scenarios. The following is a non-exhaustive list of changes that are not -considersed as incompatibile: +considersed as incompatible: * **Adding new fields** — New fields will be added when needed. Reserving this helps Cargo evolve without bumping the format version too often. diff --git a/src/doc/man/generated_txt/cargo-metadata.txt b/src/doc/man/generated_txt/cargo-metadata.txt index 3d37f6bb82c..0d14cfe8e5f 100644 --- a/src/doc/man/generated_txt/cargo-metadata.txt +++ b/src/doc/man/generated_txt/cargo-metadata.txt @@ -22,7 +22,7 @@ OUTPUT FORMAT Compatibility Within the same output format version, the compatibility is maintained, except some scenarios. The following is a non-exhaustive list of changes - that are not considersed as incompatibile: + that are not considersed as incompatible: o Adding new fields — New fields will be added when needed. Reserving this helps Cargo evolve without bumping the format version too often. diff --git a/src/doc/src/commands/cargo-metadata.md b/src/doc/src/commands/cargo-metadata.md index 5be6992d748..24b68d28317 100644 --- a/src/doc/src/commands/cargo-metadata.md +++ b/src/doc/src/commands/cargo-metadata.md @@ -27,7 +27,7 @@ for a Rust API for reading the metadata. Within the same output format version, the compatibility is maintained, except some scenarios. The following is a non-exhaustive list of changes that are not -considersed as incompatibile: +considersed as incompatible: * **Adding new fields** — New fields will be added when needed. Reserving this helps Cargo evolve without bumping the format version too often. diff --git a/src/doc/src/guide/continuous-integration.md b/src/doc/src/guide/continuous-integration.md index 949af0510bd..0c3cec8892c 100644 --- a/src/doc/src/guide/continuous-integration.md +++ b/src/doc/src/guide/continuous-integration.md @@ -118,7 +118,7 @@ When testing the latest versions some considerations are: - Rate of new dependencies being published - Level of risk a project is willing to accept - CI costs, including indirect costs like if a CI service has a maximum for - parallel runners, causing new jobs to be serialized when at the maxium. + parallel runners, causing new jobs to be serialized when at the maximum. Some potential solutions include: - [Not checking in the `Cargo.lock`](../faq.md#why-have-cargolock-in-version-control) diff --git a/src/doc/src/reference/registry-authentication.md b/src/doc/src/reference/registry-authentication.md index 15a96c6e9f6..7da33c590e6 100644 --- a/src/doc/src/reference/registry-authentication.md +++ b/src/doc/src/reference/registry-authentication.md @@ -1,7 +1,7 @@ # Registry Authentication Cargo authenticates to registries with through credential providers. These credential providers are external executables or built-in providers that Cargo -uses to store and retreive credentials. +uses to store and retrieve credentials. Using alternative registries with authentication *requires* a credential provider to be configured to avoid unknowningly storing unecrypted credentials on disk. For historical reasons, public @@ -54,7 +54,7 @@ may change in future Cargo releases (though there are currently no plans to do s ### `cargo:token` Uses Cargo's [credentials](config.md#credentials) file to store tokens unencrypted in plain text. -When retreiving tokens, checks the `CARGO_REGISTRIES__TOKEN` environment variable. +When retrieving tokens, checks the `CARGO_REGISTRIES__TOKEN` environment variable. If this credential provider is not listed, then the `*_TOKEN` environment variables will not work. ### `cargo:wincred` diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1 index 95597d413c8..c1195c232a8 100644 --- a/src/etc/man/cargo-metadata.1 +++ b/src/etc/man/cargo-metadata.1 @@ -22,7 +22,7 @@ for a Rust API for reading the metadata. .SS "Compatibility" Within the same output format version, the compatibility is maintained, except some scenarios. The following is a non\-exhaustive list of changes that are not -considersed as incompatibile: +considersed as incompatible: .sp .RS 4 \h'-04'\(bu\h'+02'\fBAdding new fields\fR \[em] New fields will be added when needed. Reserving this diff --git a/tests/testsuite/cargo_new/mod.rs b/tests/testsuite/cargo_new/mod.rs index 88731639565..969b09f4f0d 100644 --- a/tests/testsuite/cargo_new/mod.rs +++ b/tests/testsuite/cargo_new/mod.rs @@ -4,4 +4,4 @@ mod inherit_workspace_package_table; mod inherit_workspace_package_table_with_edition; mod inherit_workspace_package_table_with_registry; mod inherit_workspace_package_table_without_version; -mod not_inherit_workspace_package_table_if_not_memebers; +mod not_inherit_workspace_package_table_if_not_members; diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/in/Cargo.toml b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/Cargo.toml similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/in/Cargo.toml rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/Cargo.toml diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/in/README.md b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/README.md similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/in/README.md rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/README.md diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/in/src/lib.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/src/lib.rs similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/in/src/lib.rs rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/in/src/lib.rs diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/mod.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/mod.rs rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/mod.rs diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/Cargo.toml b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/Cargo.toml similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/Cargo.toml rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/Cargo.toml diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/foo/Cargo.toml b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/foo/Cargo.toml similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/foo/Cargo.toml rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/foo/Cargo.toml diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/foo/src/main.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/foo/src/main.rs similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/foo/src/main.rs rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/foo/src/main.rs diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/src/lib.rs b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/src/lib.rs similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/out/src/lib.rs rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/out/src/lib.rs diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/stderr.log b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/stderr.log rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stderr.log diff --git a/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/stdout.log b/tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log similarity index 100% rename from tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_memebers/stdout.log rename to tests/testsuite/cargo_new/not_inherit_workspace_package_table_if_not_members/stdout.log diff --git a/tests/testsuite/credential_process.rs b/tests/testsuite/credential_process.rs index 2f59e8856a4..815089f7020 100644 --- a/tests/testsuite/credential_process.rs +++ b/tests/testsuite/credential_process.rs @@ -546,7 +546,7 @@ You may press ctrl-c [..] [PUBLISHED] foo v0.1.0 [..] "#; - // The output should contain two JSON messages from the provider in boths cases: + // The output should contain two JSON messages from the provider in both cases: // The first because the credential is expired, the second because the provider // indicated that the token was non-operation-independent. p.cargo("publish --registry alternative --no-verify") diff --git a/tests/testsuite/freshness.rs b/tests/testsuite/freshness.rs index f28f1ff4686..d450cbbd978 100644 --- a/tests/testsuite/freshness.rs +++ b/tests/testsuite/freshness.rs @@ -2786,7 +2786,7 @@ fn verify_source_before_recompile() { "vendor/bar/src/lib.rs", r#"compile_error!("You shall not pass!");"#, ); - // Should ignore modifed sources without any recompile. + // Should ignore modified sources without any recompile. p.cargo("check --verbose") .with_stderr( "\ @@ -2799,7 +2799,7 @@ fn verify_source_before_recompile() { // Add a `RUSTFLAGS` to trigger a recompile. // - // Cargo should refuse to build because of checksum verfication failure. + // Cargo should refuse to build because of checksum verification failure. // Cargo shouldn't recompile dependency `bar`. p.cargo("check --verbose") .env("RUSTFLAGS", "-W warnings") diff --git a/tests/testsuite/profile_config.rs b/tests/testsuite/profile_config.rs index 37a609e8fc4..143c050f962 100644 --- a/tests/testsuite/profile_config.rs +++ b/tests/testsuite/profile_config.rs @@ -370,7 +370,7 @@ fn profile_config_mixed_types() { #[cargo_test] fn named_config_profile() { - // Exercises config named profies. + // Exercises config named profiles. // foo -> middle -> bar -> dev // middle exists in Cargo.toml, the others in .cargo/config use super::config::ConfigBuilder; diff --git a/tests/testsuite/script.rs b/tests/testsuite/script.rs index 0c0441d625a..75cafc2b2f6 100644 --- a/tests/testsuite/script.rs +++ b/tests/testsuite/script.rs @@ -162,7 +162,7 @@ fn warn_when_plugin_masks_manifest_on_stable() { .with_stdout("") .with_stderr( "\ -warning: external subcommand `echo.rs` has the appearance of a manfiest-command +warning: external subcommand `echo.rs` has the appearance of a manifest-command This was previously accepted but will be phased out when `-Zscript` is stabilized. For more information, see issue #12207 . ",