itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #9484 - kklibo:master, r=ehuss

Browse Source 
fix 6 typos

Fixes #9483
This commit is contained in:
bors 2021-05-14 00:59:52 +00:00
commit 44596fa2b1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/doc/src/faq.md
View File

@ -204,7 +204,7 @@ replacement][replace].
### Why is Cargo rebuilding my code? ### Why is Cargo rebuilding my code?
Cargo is responsible for incrementally compiling crates in your project. This Cargo is responsible for incrementally compiling crates in your project. This
means that if you type `cargo build` twice the second one shouldn't rebuild you means that if you type `cargo build` twice the second one shouldn't rebuild your
crates.io dependencies, for example. Nevertheless bugs arise and Cargo can crates.io dependencies, for example. Nevertheless bugs arise and Cargo can
sometimes rebuild code when you're not expecting it! sometimes rebuild code when you're not expecting it!

2
src/doc/src/reference/features.md
View File

@ -440,7 +440,7 @@ guide, consider adding the documentation there (for example, see [serde.rs]).
If you have a binary project, consider documenting the features in the README If you have a binary project, consider documenting the features in the README
or other documentation for the project (for example, see [sccache]). or other documentation for the project (for example, see [sccache]).
Clearly documenting the features can set expectations about features Clearly documenting the features can set expectations about features that are
considered "unstable" or otherwise shouldn't be used. For example, if there is considered "unstable" or otherwise shouldn't be used. For example, if there is
an optional dependency, but you don't want users to explicitly list that an optional dependency, but you don't want users to explicitly list that
optional dependency as a feature, exclude it from the documented list. optional dependency as a feature, exclude it from the documented list.

2
src/doc/src/reference/overriding-dependencies.md
View File

@ -222,7 +222,7 @@ Note that this will actually resolve to two versions of the `uuid` crate. The
`my-binary` crate will continue to use the 1.x.y series of the `uuid` crate but `my-binary` crate will continue to use the 1.x.y series of the `uuid` crate but
the `my-library` crate will use the `2.0.0` version of `uuid`. This will allow you the `my-library` crate will use the `2.0.0` version of `uuid`. This will allow you
to gradually roll out breaking changes to a crate through a dependency graph to gradually roll out breaking changes to a crate through a dependency graph
without being force to update everything all at once. without being forced to update everything all at once.
### Using `[patch]` with multiple versions ### Using `[patch]` with multiple versions

2
src/doc/src/reference/source-replacement.md
View File

@ -107,7 +107,7 @@ the crates that are present).
A "directory source" is similar to a local registry source where it contains a A "directory source" is similar to a local registry source where it contains a
number of crates available on the local filesystem, suitable for vendoring number of crates available on the local filesystem, suitable for vendoring
dependencies. Directory sources are primarily managed the `cargo vendor` dependencies. Directory sources are primarily managed by the `cargo vendor`
subcommand. subcommand.
Directory sources are distinct from local registries though in that they contain Directory sources are distinct from local registries though in that they contain

4
src/doc/src/reference/unstable.md
View File

@ -847,7 +847,7 @@ Other possible string values of `strip` are `none`, `symbols`, and `off`. The de
You can also configure this option with the two absolute boolean values You can also configure this option with the two absolute boolean values
`true` and `false`. The former enables `strip` at its higher level, `symbols`, `true` and `false`. The former enables `strip` at its higher level, `symbols`,
whilst the later disables `strip` completely. while the latter disables `strip` completely.
### rustdoc-map ### rustdoc-map
* Tracking Issue: [#8296](https://github.com/rust-lang/cargo/issues/8296) * Tracking Issue: [#8296](https://github.com/rust-lang/cargo/issues/8296)
@ -1153,7 +1153,7 @@ cargo logout -Z credential-process
* RFC: [#2495](https://github.com/rust-lang/rfcs/blob/master/text/2495-min-rust-version.md) * RFC: [#2495](https://github.com/rust-lang/rfcs/blob/master/text/2495-min-rust-version.md)
* rustc Tracking Issue: [#65262](https://github.com/rust-lang/rust/issues/65262) * rustc Tracking Issue: [#65262](https://github.com/rust-lang/rust/issues/65262)
The `-Z rust-version` flag enables the reading the `rust-version` field in the The `-Z rust-version` flag enables the reading of the `rust-version` field in the
Cargo manifest `package` section. This can be used by a package to state a minimal Cargo manifest `package` section. This can be used by a package to state a minimal
version of the compiler required to build the package. An error is generated if version of the compiler required to build the package. An error is generated if
the version of rustc is older than the stated `rust-version`. The the version of rustc is older than the stated `rust-version`. The