Skip to content

Commit

Permalink
Auto merge of #10454 - cuishuang:master, r=ehuss
Browse files Browse the repository at this point in the history
fix some typos
  • Loading branch information
bors committed Mar 4, 2022
2 parents 9cffcfc + 8f26842 commit a6c7172
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion benches/benchsuite/benches/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ fn make_config(ws_root: &Path) -> Config {
config
}

/// Benchmark of the full `resovle_ws_with_opts` which runs the resolver
/// Benchmark of the full `resolve_ws_with_opts` which runs the resolver
/// twice, the feature resolver, and more. This is a major component of a
/// regular cargo build.
fn resolve_ws(c: &mut Criterion) {
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/core/source/source_id.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ impl SourceId {
})
}

/// Gets the `SourceId` associated with given name of the remote regsitry.
/// Gets the `SourceId` associated with given name of the remote registry.
pub fn alt_registry(config: &Config, key: &str) -> CargoResult<SourceId> {
let url = config.get_registry_index(key)?;
Ok(SourceId::wrap(SourceIdInner {
Expand Down Expand Up @@ -574,7 +574,7 @@ impl PartialOrd for SourceKind {
// (1.53) #9397 was created to fix the regression introduced by #9133 relative
// to the current stable (1.51).
//
// That's all a long winded way of saying "it's wierd that git deps hash first
// That's all a long winded way of saying "it's weird that git deps hash first
// and are sorted last, but it's the way it is right now". The author of this
// comment chose to handwrite the `Ord` implementation instead of the `Hash`
// implementation, but it's only required that at most one of them is
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/tree/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub struct TreeOptions {
pub graph_features: bool,
/// Maximum display depth of the dependency tree.
pub max_display_depth: u32,
/// Exculdes proc-macro dependencies.
/// Excludes proc-macro dependencies.
pub no_proc_macro: bool,
}

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/util/toml/targets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,7 @@ fn configure(toml: &TomlTarget, target: &mut Target) -> CargoResult<()> {
}

/// Build an error message for a target path that cannot be determined either
/// by auto-discovery or specifiying.
/// by auto-discovery or specifying.
///
/// This function tries to detect commonly wrong paths for targets:
///
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/reference/unstable.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Each new feature described below should explain how to use it.
* Output behavior
* [out-dir](#out-dir) — Adds a directory where artifacts are copied to.
* [terminal-width](#terminal-width) — Tells rustc the width of the terminal so that long diagnostic messages can be truncated to be more readable.
* [Different binary name](#different-binary-name) — Assign a name to the built binary that is seperate from the crate name.
* [Different binary name](#different-binary-name) — Assign a name to the built binary that is separate from the crate name.
* Compile behavior
* [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.
* [doctest-xcompile](#doctest-xcompile) — Supports running doctests with the `--target` flag.
Expand Down

0 comments on commit a6c7172

Please sign in to comment.