Skip to content

Commit a6c7172

Browse files
committed
Auto merge of #10454 - cuishuang:master, r=ehuss
fix some typos
2 parents 9cffcfc + 8f26842 commit a6c7172

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

benches/benchsuite/benches/resolve.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ fn make_config(ws_root: &Path) -> Config {
236236
config
237237
}
238238

239-
/// Benchmark of the full `resovle_ws_with_opts` which runs the resolver
239+
/// Benchmark of the full `resolve_ws_with_opts` which runs the resolver
240240
/// twice, the feature resolver, and more. This is a major component of a
241241
/// regular cargo build.
242242
fn resolve_ws(c: &mut Criterion) {

src/cargo/core/source/source_id.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ impl SourceId {
201201
})
202202
}
203203

204-
/// Gets the `SourceId` associated with given name of the remote regsitry.
204+
/// Gets the `SourceId` associated with given name of the remote registry.
205205
pub fn alt_registry(config: &Config, key: &str) -> CargoResult<SourceId> {
206206
let url = config.get_registry_index(key)?;
207207
Ok(SourceId::wrap(SourceIdInner {
@@ -574,7 +574,7 @@ impl PartialOrd for SourceKind {
574574
// (1.53) #9397 was created to fix the regression introduced by #9133 relative
575575
// to the current stable (1.51).
576576
//
577-
// That's all a long winded way of saying "it's wierd that git deps hash first
577+
// That's all a long winded way of saying "it's weird that git deps hash first
578578
// and are sorted last, but it's the way it is right now". The author of this
579579
// comment chose to handwrite the `Ord` implementation instead of the `Hash`
580580
// implementation, but it's only required that at most one of them is

src/cargo/ops/tree/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub struct TreeOptions {
4747
pub graph_features: bool,
4848
/// Maximum display depth of the dependency tree.
4949
pub max_display_depth: u32,
50-
/// Exculdes proc-macro dependencies.
50+
/// Excludes proc-macro dependencies.
5151
pub no_proc_macro: bool,
5252
}
5353

src/cargo/util/toml/targets.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ fn configure(toml: &TomlTarget, target: &mut Target) -> CargoResult<()> {
821821
}
822822

823823
/// Build an error message for a target path that cannot be determined either
824-
/// by auto-discovery or specifiying.
824+
/// by auto-discovery or specifying.
825825
///
826826
/// This function tries to detect commonly wrong paths for targets:
827827
///

src/doc/src/reference/unstable.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Each new feature described below should explain how to use it.
7171
* Output behavior
7272
* [out-dir](#out-dir) — Adds a directory where artifacts are copied to.
7373
* [terminal-width](#terminal-width) — Tells rustc the width of the terminal so that long diagnostic messages can be truncated to be more readable.
74-
* [Different binary name](#different-binary-name) — Assign a name to the built binary that is seperate from the crate name.
74+
* [Different binary name](#different-binary-name) — Assign a name to the built binary that is separate from the crate name.
7575
* Compile behavior
7676
* [mtime-on-use](#mtime-on-use) — Updates the last-modified timestamp on every dependency every time it is used, to provide a mechanism to delete unused artifacts.
7777
* [doctest-xcompile](#doctest-xcompile) — Supports running doctests with the `--target` flag.

0 commit comments

Comments
 (0)