Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix more typos (codespell) #6903

Merged
merged 1 commit into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/fingerprint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
//! and reuse the cache. This means that we can't ever hash an absolute path
//! name. Instead we always hash relative path names and the "root" is passed
//! in at runtime dynamically. Some of this is best effort, but the general
//! idea is that we assume all acceses within a crate stay within that
//! idea is that we assume all accesses within a crate stay within that
//! crate.
//!
//! These are pretty tricky to test for unfortunately, but we should have a good
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ impl Job {
}

/// Returns whether this job was fresh/dirty, where "fresh" means we're
/// likely to perform just some small bookeeping where "dirty" means we'll
/// likely to perform just some small bookkeeping where "dirty" means we'll
/// probably do something slow like invoke rustc.
pub fn freshness(&self) -> Freshness {
self.fresh
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/job_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ impl<'a, 'cfg> JobQueue<'a, 'cfg> {
// comment has been sitting here for a long time feel free to refactor
// away crossbeam.
crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
.expect("child threads should't panic")
.expect("child threads shouldn't panic")
}

fn drain_the_queue(
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ fn build_deps_args<'a, 'cfg>(
}
}

// This will only be set if we're already usign a feature
// This will only be set if we're already using a feature
// requiring nightly rust
if unstable_opts {
cmd.arg("-Z").arg("unstable-options");
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/interning.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl Hash for InternedString {

impl Borrow<str> for InternedString {
// If we implement Hash as `identity(self).hash(state)`,
// then this will nead to be removed.
// then this will need to be removed.
fn borrow(&self) -> &str {
self.as_str()
}
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> {
// Ok we're going to download this crate, so let's set up all our
// internal state and hand off an `Easy` handle to our libcurl `Multi`
// handle. This won't actually start the transfer, but later it'll
// hapen during `wait_for_download`
// happen during `wait_for_download`
let token = self.next;
self.next += 1;
debug!("downloading {} as {}", id, token);
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ impl<'cfg> PackageRegistry<'cfg> {
.iter()
.map(|dep| {
debug!(
"registring a patch for `{}` with `{}`",
"registering a patch for `{}` with `{}`",
url,
dep.package_name()
);
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/core/resolver/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl ResolverProgress {
printed: false,
deps_time: Duration::new(0, 0),
// Some CI setups are much slower then the equipment used by Cargo itself.
// Architectures that do not have a modern processor, hardware emulation, ect.
// Architectures that do not have a modern processor, hardware emulation, etc.
// In the test code we have `slow_cpu_multiplier`, but that is not accessible here.
#[cfg(debug_assertions)]
slow_cpu_multiplier: std::env::var("CARGO_TEST_SLOW_CPU_MULTIPLIER")
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ fn verify_dependencies(pkg: &Package) -> CargoResult<()> {
}

// Checks if the package source is in a *git* DVCS repository. If *git*, and
// the source is *dirty* (e.g., has uncommited changes) and not `allow_dirty`
// the source is *dirty* (e.g., has uncommitted changes) and not `allow_dirty`
// then `bail!` with an informative message. Otherwise return the sha1 hash of
// the current *HEAD* commit, or `None` if *dirty*.
fn check_repo_state(
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/sources/git/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ pub fn fetch(
// request we're about to issue.
maybe_gc_repo(repo)?;

// Unfortuantely `libgit2` is notably lacking in the realm of authentication
// Unfortunately `libgit2` is notably lacking in the realm of authentication
// when compared to the `git` command line. As a result, allow an escape
// hatch for users that would prefer to use `git`-the-CLI for fetching
// repositories instead of `libgit2`-the-library. This should make more
Expand Down Expand Up @@ -864,7 +864,7 @@ fn reinitialize(repo: &mut git2::Repository) -> CargoResult<()> {

fn init(path: &Path, bare: bool) -> CargoResult<git2::Repository> {
let mut opts = git2::RepositoryInitOptions::new();
// Skip anyting related to templates, they just call all sorts of issues as
// Skip anything related to templates, they just call all sorts of issues as
// we really don't want to use them yet they insist on being used. See #6240
// for an example issue that comes up.
opts.external_template(false);
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/sources/registry/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ pub struct RegistryConfig {
///
/// For backwards compatibility, if the string does not contain `{crate}` or
/// `{version}`, it will be extended with `/{crate}/{version}/download` to
/// support registries like crates.io which were crated before the
/// support registries like crates.io which were created before the
/// templating setup was created.
pub dl: String,

Expand Down
16 changes: 8 additions & 8 deletions tests/testsuite/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ fn public_dependency_filling_in_and_update() {
}

#[test]
fn public_dependency_skiping() {
fn public_dependency_skipping() {
// When backtracking due to a failed dependency, if Cargo is
// trying to be clever and skip irrelevant dependencies, care must
// the effects of pub dep must be accounted for.
Expand All @@ -346,7 +346,7 @@ fn public_dependency_skiping() {
}

#[test]
fn public_dependency_skiping_in_backtracking() {
fn public_dependency_skipping_in_backtracking() {
// When backtracking due to a failed dependency, if Cargo is
// trying to be clever and skip irrelevant dependencies, care must
// the effects of pub dep must be accounted for.
Expand Down Expand Up @@ -1127,11 +1127,11 @@ fn resolving_with_constrained_sibling_transitive_dep_effects() {
}

#[test]
fn incomplete_information_skiping() {
fn incomplete_information_skipping() {
// When backtracking due to a failed dependency, if Cargo is
// trying to be clever and skip irrelevant dependencies, care must
// be taken to not miss the transitive effects of alternatives.
// Fuzzing discovered that for some reason cargo was skiping based
// Fuzzing discovered that for some reason cargo was skipping based
// on incomplete information in the following case:
// minimized bug found in:
// https://github.com/rust-lang/cargo/commit/003c29b0c71e5ea28fbe8e72c148c755c9f3f8d9
Expand Down Expand Up @@ -1176,11 +1176,11 @@ fn incomplete_information_skiping() {
}

#[test]
fn incomplete_information_skiping_2() {
fn incomplete_information_skipping_2() {
// When backtracking due to a failed dependency, if Cargo is
// trying to be clever and skip irrelevant dependencies, care must
// be taken to not miss the transitive effects of alternatives.
// Fuzzing discovered that for some reason cargo was skiping based
// Fuzzing discovered that for some reason cargo was skipping based
// on incomplete information in the following case:
// https://github.com/rust-lang/cargo/commit/003c29b0c71e5ea28fbe8e72c148c755c9f3f8d9
let input = vec![
Expand Down Expand Up @@ -1245,11 +1245,11 @@ fn incomplete_information_skiping_2() {
}

#[test]
fn incomplete_information_skiping_3() {
fn incomplete_information_skipping_3() {
// When backtracking due to a failed dependency, if Cargo is
// trying to be clever and skip irrelevant dependencies, care must
// be taken to not miss the transitive effects of alternatives.
// Fuzzing discovered that for some reason cargo was skiping based
// Fuzzing discovered that for some reason cargo was skipping based
// on incomplete information in the following case:
// minimized bug found in:
// https://github.com/rust-lang/cargo/commit/003c29b0c71e5ea28fbe8e72c148c755c9f3f8d9
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/support/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1740,7 +1740,7 @@ pub fn is_coarse_mtime() -> bool {
}

/// Some CI setups are much slower then the equipment used by Cargo itself.
/// Architectures that do not have a modern processor, hardware emulation, ect.
/// Architectures that do not have a modern processor, hardware emulation, etc.
/// This provides a way for those setups to increase the cut off for all the time based test.
pub fn slow_cpu_multiplier(main: u64) -> Duration {
lazy_static::lazy_static! {
Expand Down