From 022dc5b381a90c3e46c5d2db445ef111bff3ab66 Mon Sep 17 00:00:00 2001 From: Scott Schafer Date: Fri, 25 Apr 2025 07:58:32 -0600 Subject: [PATCH] chore: Address most typos --- .github/ISSUE_TEMPLATE/config.yml | 2 +- crates/cargo-test-support/src/registry.rs | 4 ++-- crates/crates-io/lib.rs | 4 ++-- crates/home/src/lib.rs | 4 ++-- src/bin/cargo/cli.rs | 4 ++-- src/cargo/core/compiler/fingerprint/dep_info.rs | 2 +- src/cargo/core/compiler/fingerprint/mod.rs | 10 +++++----- src/cargo/core/compiler/job_queue/mod.rs | 2 +- src/cargo/core/compiler/mod.rs | 4 ++-- src/cargo/core/compiler/output_depinfo.rs | 2 +- src/cargo/core/compiler/output_sbom.rs | 8 ++++---- src/cargo/core/features.rs | 2 +- src/cargo/core/registry.rs | 2 +- src/cargo/core/resolver/encode.rs | 2 +- src/cargo/ops/cargo_package/mod.rs | 10 ++++------ src/cargo/ops/tree/graph.rs | 2 +- src/cargo/sources/git/utils.rs | 2 +- src/cargo/sources/registry/mod.rs | 2 +- src/cargo/util/context/mod.rs | 2 +- src/cargo/util/toml/mod.rs | 4 ++-- src/doc/src/CHANGELOG.md | 4 ++-- tests/testsuite/build.rs | 2 +- tests/testsuite/build_script_env.rs | 2 +- tests/testsuite/custom_target.rs | 2 +- tests/testsuite/direct_minimal_versions.rs | 6 +++--- tests/testsuite/docscrape.rs | 2 +- tests/testsuite/future_incompat_report.rs | 2 +- tests/testsuite/git.rs | 2 +- tests/testsuite/install.rs | 2 +- tests/testsuite/package.rs | 4 ++-- tests/testsuite/pub_priv.rs | 2 +- tests/testsuite/registry.rs | 2 +- .../rustc_fixtures/frontmatter-inner-hyphens-2.rs | 2 +- tests/testsuite/source_replacement.rs | 2 +- 34 files changed, 54 insertions(+), 56 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ed4289847..aefa93008 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -7,4 +7,4 @@ contact_links: url: https://internals.rust-lang.org/c/tools-and-infrastructure/cargo about: > Need more discussions with your next big idea? - Reach out the coummunity on the internals forum. + Reach out the community on the internals forum. diff --git a/crates/cargo-test-support/src/registry.rs b/crates/cargo-test-support/src/registry.rs index afcf3f7e6..e4f83fbb7 100644 --- a/crates/cargo-test-support/src/registry.rs +++ b/crates/cargo-test-support/src/registry.rs @@ -64,7 +64,7 @@ use time::format_description::well_known::Rfc3339; use time::{Duration, OffsetDateTime}; use url::Url; -/// Path to the local index for psuedo-crates.io. +/// Path to the local index for pseudo-crates.io. /// /// This is a Git repo /// initialized with a `config.json` file pointing to `dl_path` for downloads @@ -622,7 +622,7 @@ struct PackageFile { const DEFAULT_MODE: u32 = 0o644; -/// Setup a local psuedo-crates.io [`TestRegistry`] +/// Setup a local pseudo-crates.io [`TestRegistry`] /// /// This is implicitly called by [`Package::new`]. /// diff --git a/crates/crates-io/lib.rs b/crates/crates-io/lib.rs index ade593739..b1dbd59c4 100644 --- a/crates/crates-io/lib.rs +++ b/crates/crates-io/lib.rs @@ -143,7 +143,7 @@ pub enum Error { #[error(transparent)] Curl(#[from] curl::Error), - /// Error from seriailzing the request payload and deserializing the + /// Error from serializing the request payload and deserializing the /// response body (like response body didn't match expected structure). #[error(transparent)] Json(#[from] serde_json::Error), @@ -183,7 +183,7 @@ pub enum Error { #[error("{0}")] InvalidToken(&'static str), - /// Server was unavailable and timeouted. Happened when uploading a way + /// Server was unavailable and timed out. Happened when uploading a way /// too large tarball to crates.io. #[error( "Request timed out after 30 seconds. If you're trying to \ diff --git a/crates/home/src/lib.rs b/crates/home/src/lib.rs index b5f4cbd27..cc3e93a19 100644 --- a/crates/home/src/lib.rs +++ b/crates/home/src/lib.rs @@ -75,7 +75,7 @@ fn home_dir_inner() -> Option { std::env::home_dir() } -/// Returns the storage directory used by Cargo, often knowns as +/// Returns the storage directory used by Cargo, often known as /// `.cargo` or `CARGO_HOME`. /// /// It returns one of the following values, in this order of @@ -112,7 +112,7 @@ pub fn cargo_home_with_cwd(cwd: &Path) -> io::Result { env::cargo_home_with_cwd_env(&env::OS_ENV, cwd) } -/// Returns the storage directory used by rustup, often knowns as +/// Returns the storage directory used by rustup, often known as /// `.rustup` or `RUSTUP_HOME`. /// /// It returns one of the following values, in this order of diff --git a/src/bin/cargo/cli.rs b/src/bin/cargo/cli.rs index 94dc55dec..f549e4b13 100644 --- a/src/bin/cargo/cli.rs +++ b/src/bin/cargo/cli.rs @@ -69,8 +69,8 @@ pub fn main(gctx: &mut GlobalContext) -> CliResult { } else if let Some(code) = expanded_args.get_one::("explain") { // Don't let config errors get in the way of parsing arguments let _ = configure_gctx(gctx, &expanded_args, None, global_args, None); - let mut procss = gctx.load_global_rustc(None)?.process(); - procss.arg("--explain").arg(code).exec()?; + let mut process = gctx.load_global_rustc(None)?.process(); + process.arg("--explain").arg(code).exec()?; } else if expanded_args.flag("list") { // Don't let config errors get in the way of parsing arguments let _ = configure_gctx(gctx, &expanded_args, None, global_args, None); diff --git a/src/cargo/core/compiler/fingerprint/dep_info.rs b/src/cargo/core/compiler/fingerprint/dep_info.rs index 25adac7bc..af182bd50 100644 --- a/src/cargo/core/compiler/fingerprint/dep_info.rs +++ b/src/cargo/core/compiler/fingerprint/dep_info.rs @@ -756,7 +756,7 @@ mod encoded_dep_info { 0x72, 0x75, 0x73, 0x74, // path bytes: "rust" 0x00, 0x00, 0x00, 0x00, // # of env vars ]; - // Cargo can't recognize v0 after `-Zchecksum-freshess` added. + // Cargo can't recognize v0 after `-Zchecksum-freshness` added. assert!(EncodedDepInfo::parse(&data).is_none()); } } diff --git a/src/cargo/core/compiler/fingerprint/mod.rs b/src/cargo/core/compiler/fingerprint/mod.rs index 34bff3d36..88cdba2f5 100644 --- a/src/cargo/core/compiler/fingerprint/mod.rs +++ b/src/cargo/core/compiler/fingerprint/mod.rs @@ -1962,12 +1962,12 @@ where return Some(StaleItem::MissingFile(reference.to_path_buf())); }; - let skipable_dirs = if let Ok(cargo_home) = home::cargo_home() { - let skipable_dirs: Vec<_> = ["git", "registry"] + let skippable_dirs = if let Ok(cargo_home) = home::cargo_home() { + let skippable_dirs: Vec<_> = ["git", "registry"] .into_iter() .map(|subfolder| cargo_home.join(subfolder)) .collect(); - Some(skipable_dirs) + Some(skippable_dirs) } else { None }; @@ -1978,8 +1978,8 @@ where // (see also #9455 about marking the src directory readonly) which avoids rebuilds when CI // caches $CARGO_HOME/registry/{index, cache} and $CARGO_HOME/git/db across runs, keeping // the content the same but changing the mtime. - if let Some(ref skipable_dirs) = skipable_dirs { - if skipable_dirs.iter().any(|dir| path.starts_with(dir)) { + if let Some(ref skippable_dirs) = skippable_dirs { + if skippable_dirs.iter().any(|dir| path.starts_with(dir)) { continue; } } diff --git a/src/cargo/core/compiler/job_queue/mod.rs b/src/cargo/core/compiler/job_queue/mod.rs index 152e7e75a..a6d96e2cc 100644 --- a/src/cargo/core/compiler/job_queue/mod.rs +++ b/src/cargo/core/compiler/job_queue/mod.rs @@ -213,7 +213,7 @@ pub struct WarningCount { /// were duplicates of a previous warning pub duplicates: usize, /// number of fixable warnings set to `NotAllowed` - /// if any errors have been seen ofr the current + /// if any errors have been seen for the current /// target pub fixable: FixableWarnings, } diff --git a/src/cargo/core/compiler/mod.rs b/src/cargo/core/compiler/mod.rs index bcdfac9ed..90a8bd0a8 100644 --- a/src/cargo/core/compiler/mod.rs +++ b/src/cargo/core/compiler/mod.rs @@ -183,7 +183,7 @@ fn compile<'gctx>( } // If we are in `--compile-time-deps` and the given unit is not a compile time - // dependency, skip compling the unit and jumps to dependencies, which still + // dependency, skip compiling the unit and jumps to dependencies, which still // have chances to be compile time dependencies if !unit.skip_non_compile_time_dep { // Build up the work to be done to compile this unit, enqueuing it once @@ -1615,7 +1615,7 @@ fn check_cfg_args(unit: &Unit) -> Vec { arg_feature.push("))"); // In addition to the package features, we also include the `test` cfg (since - // compiler-team#785, as to be able to someday apply yt conditionally), as well + // compiler-team#785, as to be able to someday apply it conditionally), as well // the `docsrs` cfg from the docs.rs service. // // We include `docsrs` here (in Cargo) instead of rustc, since there is a much closer diff --git a/src/cargo/core/compiler/output_depinfo.rs b/src/cargo/core/compiler/output_depinfo.rs index d59be10f2..a62d9a0e8 100644 --- a/src/cargo/core/compiler/output_depinfo.rs +++ b/src/cargo/core/compiler/output_depinfo.rs @@ -11,7 +11,7 @@ use crate::util::{CargoResult, internal}; use cargo_util::paths; use tracing::debug; -/// Bacially just normalizes a given path and converts it to a string. +/// Basically just normalizes a given path and converts it to a string. fn render_filename>(path: P, basedir: Option<&str>) -> CargoResult { fn wrap_path(path: &Path) -> CargoResult { path.to_str() diff --git a/src/cargo/core/compiler/output_sbom.rs b/src/cargo/core/compiler/output_sbom.rs index 4fe058d2e..c956ed01e 100644 --- a/src/cargo/core/compiler/output_sbom.rs +++ b/src/cargo/core/compiler/output_sbom.rs @@ -103,8 +103,8 @@ pub fn build_sbom(build_runner: &BuildRunner<'_, '_>, root: &Unit) -> CargoResul let mut crates = Vec::new(); let sbom_graph = build_sbom_graph(build_runner, root); - // Build set of indicies for each node in the graph for fast lookup. - let indicies: HashMap<&Unit, SbomIndex> = sbom_graph + // Build set of indices for each node in the graph for fast lookup. + let indices: HashMap<&Unit, SbomIndex> = sbom_graph .keys() .enumerate() .map(|(i, dep)| (*dep, SbomIndex(i))) @@ -115,7 +115,7 @@ pub fn build_sbom(build_runner: &BuildRunner<'_, '_>, root: &Unit) -> CargoResul let mut krate = SbomCrate::new(unit); for (dep, kind) in edges { krate.dependencies.push(SbomDependency { - index: indicies[dep], + index: indices[dep], kind: kind, }); } @@ -128,7 +128,7 @@ pub fn build_sbom(build_runner: &BuildRunner<'_, '_>, root: &Unit) -> CargoResul Ok(Sbom { version: SbomFormatVersion(1), crates, - root: indicies[root], + root: indices[root], rustc, target, }) diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index 406f76c54..f34f12ccd 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -1207,7 +1207,7 @@ fn parse_gitoxide( impl CliUnstable { /// Parses `-Z` flags from the command line, and returns messages that warn - /// if any flag has alreardy been stabilized. + /// if any flag has already been stabilized. pub fn parse( &mut self, flags: &[String], diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index e9f7286b1..ac91c0948 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -109,7 +109,7 @@ pub struct PackageRegistry<'gctx> { /// This is constructed via [`PackageRegistry::register_lock`]. /// See also [`LockedMap`]. locked: LockedMap, - /// A group of packages tha allows to use even when yanked. + /// Packages allowed to be used, even if they are yanked. yanked_whitelist: HashSet, source_config: SourceConfigMap<'gctx>, diff --git a/src/cargo/core/resolver/encode.rs b/src/cargo/core/resolver/encode.rs index d7b232c74..0c629f935 100644 --- a/src/cargo/core/resolver/encode.rs +++ b/src/cargo/core/resolver/encode.rs @@ -106,7 +106,7 @@ //! really use it that much except for `checksum`s historically. It's not //! really recommended to use this. //! -//! * The actual literal on-disk serialiation is found in +//! * The actual literal on-disk serialization is found in //! `src/cargo/ops/lockfile.rs` which basically renders a `toml::Value` in a //! special fashion to make sure we have strict control over the on-disk //! format. diff --git a/src/cargo/ops/cargo_package/mod.rs b/src/cargo/ops/cargo_package/mod.rs index 3cc656dc0..cdba3dd3d 100644 --- a/src/cargo/ops/cargo_package/mod.rs +++ b/src/cargo/ops/cargo_package/mod.rs @@ -617,12 +617,10 @@ fn build_ar_list( .iter() .filter(|t| t.is_custom_build()) { - if let Some(custome_build_path) = t.src_path().path() { - let abs_custome_build_path = - paths::normalize_path(&pkg.root().join(custome_build_path)); - if !abs_custome_build_path.is_file() || !abs_custome_build_path.starts_with(pkg.root()) - { - error_custom_build_file_not_in_package(pkg, &abs_custome_build_path, t)?; + if let Some(custom_build_path) = t.src_path().path() { + let abs_custom_build_path = paths::normalize_path(&pkg.root().join(custom_build_path)); + if !abs_custom_build_path.is_file() || !abs_custom_build_path.starts_with(pkg.root()) { + error_custom_build_file_not_in_package(pkg, &abs_custom_build_path, t)?; } } } diff --git a/src/cargo/ops/tree/graph.rs b/src/cargo/ops/tree/graph.rs index d439c8d1b..dfd62bf02 100644 --- a/src/cargo/ops/tree/graph.rs +++ b/src/cargo/ops/tree/graph.rs @@ -453,7 +453,7 @@ fn add_pkg( if !opts.edge_kinds.contains(&EdgeKind::Dep(dep.kind())) { return false; } - // Filter out proc-macrcos if requested. + // Filter out proc-macros if requested. if opts.no_proc_macro && graph.package_for_id(dep_id).proc_macro() { return false; } diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs index a68bf70a9..e0346aa2e 100644 --- a/src/cargo/sources/git/utils.rs +++ b/src/cargo/sources/git/utils.rs @@ -277,7 +277,7 @@ impl<'a> GitCheckout<'a> { &self.database.remote.url() } - /// Clone a repo for a `revision` into a local path from a `datatabase`. + /// Clone a repo for a `revision` into a local path from a `database`. /// This is a filesystem-to-filesystem clone. fn clone_into( into: &Path, diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs index ccd0acf69..c8672c3cb 100644 --- a/src/cargo/sources/registry/mod.rs +++ b/src/cargo/sources/registry/mod.rs @@ -661,7 +661,7 @@ impl<'gctx> RegistrySource<'gctx> { /// Unpacks the `.crate` tarball of the package in a given directory. /// /// Returns the path to the crate tarball directory, - /// whch is always `/-`. + /// which is always `/-`. /// /// This holds an assumption that the associated tarball already exists. pub fn unpack_package_in( diff --git a/src/cargo/util/context/mod.rs b/src/cargo/util/context/mod.rs index 0f4e64d45..62b04113f 100644 --- a/src/cargo/util/context/mod.rs +++ b/src/cargo/util/context/mod.rs @@ -1022,7 +1022,7 @@ impl GlobalContext { } /// Internal method for getting an environment variable as a list. - /// If the key is a non-mergable list and a value is found in the environment, existing values are cleared. + /// If the key is a non-mergeable list and a value is found in the environment, existing values are cleared. fn get_env_list( &self, key: &ConfigKey, diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index 70c7e7b91..54401f0d1 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -1730,7 +1730,7 @@ pub fn to_real_manifest( normalized_package.links.as_deref(), rust_version.clone(), ); - // editon2024 stops exposing implicit features, which will strip weak optional dependencies from `dependencies`, + // edition2024 stops exposing implicit features, which will strip weak optional dependencies from `dependencies`, // need to check whether `dep_name` is stripped as unused dependency if let Err(ref err) = summary { if let Some(missing_dep) = err.downcast_ref::() { @@ -2501,7 +2501,7 @@ fn validate_profiles( Ok(()) } -/// Checks stytax validity and unstable feature gate for a given profile. +/// Checks syntax validity and unstable feature gate for a given profile. pub fn validate_profile( root: &manifest::TomlProfile, name: &str, diff --git a/src/doc/src/CHANGELOG.md b/src/doc/src/CHANGELOG.md index c4c4bffb7..d1e0cba0e 100644 --- a/src/doc/src/CHANGELOG.md +++ b/src/doc/src/CHANGELOG.md @@ -46,7 +46,7 @@ - cargo-credential-libsecret: give FFI correctly-sized object [#15767](https://github.com/rust-lang/cargo/pull/15767) -- cargo-publish: includes mainfest paths when verifying +- cargo-publish: includes manifest paths when verifying [#15705](https://github.com/rust-lang/cargo/pull/15705) - cargo-tree: Fixed `no-proc-macro` being overridden by subsequent edges. [#15764](https://github.com/rust-lang/cargo/pull/15764) @@ -211,7 +211,7 @@ [#15682](https://github.com/rust-lang/cargo/pull/15682) - Update links in contrib docs [#15659](https://github.com/rust-lang/cargo/pull/15659) -- docs: clarify `--all-features` not available for all commmands +- docs: clarify `--all-features` not available for all commands [#15572](https://github.com/rust-lang/cargo/pull/15572) - docs(README): fix the link to the changelog in the Cargo book [#15597](https://github.com/rust-lang/cargo/pull/15597) diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs index 9e63e421a..68a3a0379 100644 --- a/tests/testsuite/build.rs +++ b/tests/testsuite/build.rs @@ -4488,7 +4488,7 @@ WRAPPER CALLED: rustc --crate-name foo [..] /// Checks what happens when both rust-wrapper and rustc-workspace-wrapper are set. #[cargo_test] -fn rustc_wrapper_precendence() { +fn rustc_wrapper_precedence() { let p = project().file("src/lib.rs", "").build(); let rustc_wrapper = tools::echo_wrapper(); let ws_wrapper = rustc_wrapper.with_file_name("rustc-ws-wrapper"); diff --git a/tests/testsuite/build_script_env.rs b/tests/testsuite/build_script_env.rs index 5443ff4bd..15d3a6715 100644 --- a/tests/testsuite/build_script_env.rs +++ b/tests/testsuite/build_script_env.rs @@ -385,7 +385,7 @@ fn rustc_cfg_with_and_without_value() { } #[cargo_test] -fn rerun_if_env_is_exsited_config() { +fn rerun_if_env_exists_in_config() { let p = project() .file("src/main.rs", "fn main() {}") .file( diff --git a/tests/testsuite/custom_target.rs b/tests/testsuite/custom_target.rs index 4be2335ee..83e1cf069 100644 --- a/tests/testsuite/custom_target.rs +++ b/tests/testsuite/custom_target.rs @@ -256,7 +256,7 @@ fn custom_target_ignores_filepath() { "#]]) .run(); - // But not the second time, even though the path to the custom target is dfferent. + // But not the second time, even though the path to the custom target is different. p.cargo("build --lib --target b/custom-target.json") .with_stderr_data(str![[r#" [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s diff --git a/tests/testsuite/direct_minimal_versions.rs b/tests/testsuite/direct_minimal_versions.rs index 8f870e001..d84ecbbb7 100644 --- a/tests/testsuite/direct_minimal_versions.rs +++ b/tests/testsuite/direct_minimal_versions.rs @@ -46,7 +46,7 @@ fn simple() { ); assert!( !lock.contains("1.1.0"), - "dep maximimal version cannot be present" + "dep maximal version cannot be present" ); } @@ -139,7 +139,7 @@ fn yanked() { ); assert!( !lock.contains("1.2.0"), - "dep maximimal version cannot be present" + "dep maximal version cannot be present" ); } @@ -189,7 +189,7 @@ fn indirect() { ); assert!( !lock.contains("1.1.0"), - "direct maximimal version cannot be present" + "direct maximal version cannot be present" ); assert!( !lock.contains("2.0.0"), diff --git a/tests/testsuite/docscrape.rs b/tests/testsuite/docscrape.rs index c9b45ffe0..49d500598 100644 --- a/tests/testsuite/docscrape.rs +++ b/tests/testsuite/docscrape.rs @@ -698,7 +698,7 @@ fn use_dev_deps_if_explicitly_enabled() { #[cargo_test(nightly, reason = "rustdoc scrape examples flags are unstable")] fn only_scrape_documented_targets() { - // package bar has doc = false and should not be eligible for documtation. + // package bar has doc = false and should not be eligible for documentation. let p = project() .file( "Cargo.toml", diff --git a/tests/testsuite/future_incompat_report.rs b/tests/testsuite/future_incompat_report.rs index 70d031c14..e60c15c42 100644 --- a/tests/testsuite/future_incompat_report.rs +++ b/tests/testsuite/future_incompat_report.rs @@ -417,7 +417,7 @@ The package `second-dep v0.0.2` currently triggers the following future incompat // Extract the 'id' from the stdout. We are looking // for the id in a line of the form "run `cargo report future-incompatibilities --id yZ7S`" // which is generated by Cargo to tell the user what command to run - // This is just to test that passing the id suppresses the warning mesasge. Any users needing + // This is just to test that passing the id suppresses the warning message. Any users needing // access to the report from a shell script should use the `--future-incompat-report` flag let stderr = std::str::from_utf8(&output.stderr).unwrap(); diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs index 81db49bcc..c4a0dec74 100644 --- a/tests/testsuite/git.rs +++ b/tests/testsuite/git.rs @@ -3468,7 +3468,7 @@ fn two_dep_forms() { .file("a/src/lib.rs", "") .build(); - // This'll download the git repository twice, one with HEAD and once with + // This will download the git repository twice, one with HEAD and once with // the master branch. Then it'll compile 4 crates, the 2 git deps, then // the two local deps. project diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs index c8f57681b..ae1a2d89d 100644 --- a/tests/testsuite/install.rs +++ b/tests/testsuite/install.rs @@ -2783,7 +2783,7 @@ fn dry_run_incompatible_package() { } #[cargo_test] -fn dry_run_incompatible_package_dependecy() { +fn dry_run_incompatible_package_dependency() { let p = project() .file( "Cargo.toml", diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index afe296ad6..d82a3f61b 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -3649,7 +3649,7 @@ fn larger_filesizes() { "#; let lots_of_crabs = "🦀".repeat(1337); let main_rs_contents = format!(r#"fn main() {{ println!("{}"); }}"#, lots_of_crabs); - let bar_txt_contents = "This file is relatively uncompressible, to increase the compressed + let bar_txt_contents = "This file is relatively incompressible, to increase the compressed package size beyond 1KiB. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation @@ -3765,7 +3765,7 @@ fn symlink_filesizes() { "#; let lots_of_crabs = "🦀".repeat(1337); let main_rs_contents = format!(r#"fn main() {{ println!("{}"); }}"#, lots_of_crabs); - let bar_txt_contents = "This file is relatively uncompressible, to increase the compressed + let bar_txt_contents = "This file is relatively incompressible, to increase the compressed package size beyond 1KiB. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation diff --git a/tests/testsuite/pub_priv.rs b/tests/testsuite/pub_priv.rs index c8536e0dd..85af838ec 100644 --- a/tests/testsuite/pub_priv.rs +++ b/tests/testsuite/pub_priv.rs @@ -340,7 +340,7 @@ fn allow_priv_in_tests() { } #[cargo_test(nightly, reason = "exported_private_dependencies lint is unstable")] -fn allow_priv_in_benchs() { +fn allow_priv_in_benches() { Package::new("priv_dep", "0.1.0") .file("src/lib.rs", "pub struct FromPriv;") .publish(); diff --git a/tests/testsuite/registry.rs b/tests/testsuite/registry.rs index 60a01b045..fe9a14755 100644 --- a/tests/testsuite/registry.rs +++ b/tests/testsuite/registry.rs @@ -3085,7 +3085,7 @@ fn readonly_registry_still_works() { } #[cargo_test(ignore_windows = "On Windows setting file attributes is a bit complicated")] -fn unaccessible_registry_cache_still_works() { +fn inaccessible_registry_cache_still_works() { Package::new("foo", "0.1.0").publish(); Package::new("fo2", "0.1.0").publish(); diff --git a/tests/testsuite/script/rustc_fixtures/frontmatter-inner-hyphens-2.rs b/tests/testsuite/script/rustc_fixtures/frontmatter-inner-hyphens-2.rs index 9e462eb37..8de40b8a2 100644 --- a/tests/testsuite/script/rustc_fixtures/frontmatter-inner-hyphens-2.rs +++ b/tests/testsuite/script/rustc_fixtures/frontmatter-inner-hyphens-2.rs @@ -4,7 +4,7 @@ x ---y """ --- -// Test that hypens are allowed inside frontmatters if there is some +// Test that hyphens are allowed inside frontmatters if there is some // non-whitespace character preceding them. //@check-pass diff --git a/tests/testsuite/source_replacement.rs b/tests/testsuite/source_replacement.rs index 94fdfdca9..322d63da0 100644 --- a/tests/testsuite/source_replacement.rs +++ b/tests/testsuite/source_replacement.rs @@ -297,7 +297,7 @@ fn source_replacement_with_registry_url() { } #[cargo_test] -fn source_replacement_with_no_package_in_directoy() { +fn source_replacement_with_no_package_in_directory() { let p = project() .file( "Cargo.toml",