Skip to content

Commit 0f77ed5

Browse files
committed
Auto merge of #6903 - matthiaskrgr:typos, r=ehuss
fix more typos (codespell)
2 parents 22e2f23 + b4cd609 commit 0f77ed5

File tree

13 files changed

+21
-21
lines changed

13 files changed

+21
-21
lines changed

src/cargo/core/compiler/fingerprint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
//! and reuse the cache. This means that we can't ever hash an absolute path
132132
//! name. Instead we always hash relative path names and the "root" is passed
133133
//! in at runtime dynamically. Some of this is best effort, but the general
134-
//! idea is that we assume all acceses within a crate stay within that
134+
//! idea is that we assume all accesses within a crate stay within that
135135
//! crate.
136136
//!
137137
//! These are pretty tricky to test for unfortunately, but we should have a good

src/cargo/core/compiler/job.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl Job {
6262
}
6363

6464
/// Returns whether this job was fresh/dirty, where "fresh" means we're
65-
/// likely to perform just some small bookeeping where "dirty" means we'll
65+
/// likely to perform just some small bookkeeping where "dirty" means we'll
6666
/// probably do something slow like invoke rustc.
6767
pub fn freshness(&self) -> Freshness {
6868
self.fresh

src/cargo/core/compiler/job_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ impl<'a, 'cfg> JobQueue<'a, 'cfg> {
171171
// comment has been sitting here for a long time feel free to refactor
172172
// away crossbeam.
173173
crossbeam_utils::thread::scope(|scope| self.drain_the_queue(cx, plan, scope, &helper))
174-
.expect("child threads should't panic")
174+
.expect("child threads shouldn't panic")
175175
}
176176

177177
fn drain_the_queue(

src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ fn build_deps_args<'a, 'cfg>(
978978
}
979979
}
980980

981-
// This will only be set if we're already usign a feature
981+
// This will only be set if we're already using a feature
982982
// requiring nightly rust
983983
if unstable_opts {
984984
cmd.arg("-Z").arg("unstable-options");

src/cargo/core/interning.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ impl Hash for InternedString {
6767

6868
impl Borrow<str> for InternedString {
6969
// If we implement Hash as `identity(self).hash(state)`,
70-
// then this will nead to be removed.
70+
// then this will need to be removed.
7171
fn borrow(&self) -> &str {
7272
self.as_str()
7373
}

src/cargo/core/package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ impl<'a, 'cfg> Downloads<'a, 'cfg> {
534534
// Ok we're going to download this crate, so let's set up all our
535535
// internal state and hand off an `Easy` handle to our libcurl `Multi`
536536
// handle. This won't actually start the transfer, but later it'll
537-
// hapen during `wait_for_download`
537+
// happen during `wait_for_download`
538538
let token = self.next;
539539
self.next += 1;
540540
debug!("downloading {} as {}", id, token);

src/cargo/core/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ impl<'cfg> PackageRegistry<'cfg> {
221221
.iter()
222222
.map(|dep| {
223223
debug!(
224-
"registring a patch for `{}` with `{}`",
224+
"registering a patch for `{}` with `{}`",
225225
url,
226226
dep.package_name()
227227
);

src/cargo/core/resolver/types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ impl ResolverProgress {
3030
printed: false,
3131
deps_time: Duration::new(0, 0),
3232
// Some CI setups are much slower then the equipment used by Cargo itself.
33-
// Architectures that do not have a modern processor, hardware emulation, ect.
33+
// Architectures that do not have a modern processor, hardware emulation, etc.
3434
// In the test code we have `slow_cpu_multiplier`, but that is not accessible here.
3535
#[cfg(debug_assertions)]
3636
slow_cpu_multiplier: std::env::var("CARGO_TEST_SLOW_CPU_MULTIPLIER")

src/cargo/ops/cargo_package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ fn verify_dependencies(pkg: &Package) -> CargoResult<()> {
208208
}
209209

210210
// Checks if the package source is in a *git* DVCS repository. If *git*, and
211-
// the source is *dirty* (e.g., has uncommited changes) and not `allow_dirty`
211+
// the source is *dirty* (e.g., has uncommitted changes) and not `allow_dirty`
212212
// then `bail!` with an informative message. Otherwise return the sha1 hash of
213213
// the current *HEAD* commit, or `None` if *dirty*.
214214
fn check_repo_state(

src/cargo/sources/git/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ pub fn fetch(
703703
// request we're about to issue.
704704
maybe_gc_repo(repo)?;
705705

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

865865
fn init(path: &Path, bare: bool) -> CargoResult<git2::Repository> {
866866
let mut opts = git2::RepositoryInitOptions::new();
867-
// Skip anyting related to templates, they just call all sorts of issues as
867+
// Skip anything related to templates, they just call all sorts of issues as
868868
// we really don't want to use them yet they insist on being used. See #6240
869869
// for an example issue that comes up.
870870
opts.external_template(false);

0 commit comments

Comments
 (0)