From c6c5face62fcf6db740a1399d32c33c7cc3753ab Mon Sep 17 00:00:00 2001 From: alexey semenyuk Date: Sat, 21 May 2022 17:56:22 +0000 Subject: [PATCH 1/6] Typos --- src/doc/src/reference/config.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/doc/src/reference/config.md b/src/doc/src/reference/config.md index 89e70754699..c2d8e665ef9 100644 --- a/src/doc/src/reference/config.md +++ b/src/doc/src/reference/config.md @@ -365,7 +365,7 @@ Can be overridden with the `--target-dir` CLI option. * Default: none * Environment: `CARGO_BUILD_RUSTFLAGS` or `CARGO_ENCODED_RUSTFLAGS` or `RUSTFLAGS` -Extra command-line flags to pass to `rustc`. The value may be a array of +Extra command-line flags to pass to `rustc`. The value may be an array of strings or a space-separated string. There are four mutually exclusive sources of extra flags. They are checked in @@ -402,7 +402,7 @@ appropriate profile setting. * Default: none * Environment: `CARGO_BUILD_RUSTDOCFLAGS` or `CARGO_ENCODED_RUSTDOCFLAGS` or `RUSTDOCFLAGS` -Extra command-line flags to pass to `rustdoc`. The value may be a array of +Extra command-line flags to pass to `rustdoc`. The value may be an array of strings or a space-separated string. There are three mutually exclusive sources of extra flags. They are checked in @@ -974,7 +974,7 @@ the `` will take precedence. It is an error if more than one * Environment: `CARGO_TARGET__RUSTFLAGS` Passes a set of custom flags to the compiler for this ``. The value -may be a array of strings or a space-separated string. +may be an array of strings or a space-separated string. See [`build.rustflags`](#buildrustflags) for more details on the different ways to specific extra flags. From 14154d17e753995cce532c4797b5e07787e689cd Mon Sep 17 00:00:00 2001 From: alexey semenyuk Date: Sun, 22 May 2022 13:03:25 +0000 Subject: [PATCH 2/6] Update semver.md --- src/doc/src/reference/semver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/src/reference/semver.md b/src/doc/src/reference/semver.md index 0404efdcfb2..ee6962eafa5 100644 --- a/src/doc/src/reference/semver.md +++ b/src/doc/src/reference/semver.md @@ -955,7 +955,7 @@ explicit type arguments. ### Minor: generalizing a function to use generics (supporting original type) -The type of an parameter to a function, or its return value, can be +The type of a parameter to a function, or its return value, can be *generalized* to use generics, including by introducing a new type parameter, as long as it can be instantiated to the original type. For example, the following changes are allowed: From aa771595a9c176f38179c46c5f546f74e667e8eb Mon Sep 17 00:00:00 2001 From: alexey semenyuk Date: Sun, 22 May 2022 14:00:01 +0000 Subject: [PATCH 3/6] Update cargo-run.md --- src/doc/src/commands/cargo-run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index f71a769d497..ea0281f2c55 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -65,7 +65,7 @@ for more details.
-
-F features
+
-f features
--features features
Space or comma separated list of features to activate. Features of workspace members may be enabled with package-name/feature-name syntax. This flag may From acbb3ca753290932ba01193d043cdc23637a1fb9 Mon Sep 17 00:00:00 2001 From: alexey semenyuk Date: Sun, 22 May 2022 15:19:49 +0000 Subject: [PATCH 4/6] Update faq.md --- src/doc/src/faq.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doc/src/faq.md b/src/doc/src/faq.md index a993deb1825..e27df5afee8 100644 --- a/src/doc/src/faq.md +++ b/src/doc/src/faq.md @@ -135,9 +135,9 @@ picture to decide what versions of dependencies should be used. with wildcard dependency constraints.** While libraries _can_, strictly speaking, they should not. A version requirement -of `*` says “This will work with every version ever,” which is never going +of `*` says “This will work with every version ever”, which is never going to be true. Libraries should always specify the range that they do work with, -even if it’s something as general as “every 1.x.y version.” +even if it’s something as general as “every 1.x.y version”. ### Why `Cargo.toml`? From 9dc393e15b944da9486e844fe99413ed79733694 Mon Sep 17 00:00:00 2001 From: alexey semenyuk Date: Sun, 22 May 2022 15:25:55 +0000 Subject: [PATCH 5/6] Update faq.md --- src/doc/src/faq.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/doc/src/faq.md b/src/doc/src/faq.md index e27df5afee8..bae171b891e 100644 --- a/src/doc/src/faq.md +++ b/src/doc/src/faq.md @@ -3,7 +3,7 @@ ### Is the plan to use GitHub as a package repository? No. The plan for Cargo is to use [crates.io], like npm or Rubygems do with -npmjs.org and rubygems.org. +[npmjs.com][1] and [rubygems.org][3]. We plan to support git repositories as a source of packages forever, because they can be used for early development and temporary patches, @@ -23,8 +23,9 @@ central registry model as well as a Git-based model, and most packages are downloaded through the registry in those ecosystems, with an important minority of packages making use of git-based packages. -[1]: https://www.npmjs.org +[1]: https://www.npmjs.com [2]: https://bundler.io +[3]: https://rubygems.org Some of the advantages that make a central registry popular in other languages include: From d48a7736963f0940ddda63d4a7b8e24aa1d5bd66 Mon Sep 17 00:00:00 2001 From: alexey semenyuk Date: Sun, 22 May 2022 22:15:41 +0000 Subject: [PATCH 6/6] Reverted option --- src/doc/src/commands/cargo-run.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/src/commands/cargo-run.md b/src/doc/src/commands/cargo-run.md index ea0281f2c55..f71a769d497 100644 --- a/src/doc/src/commands/cargo-run.md +++ b/src/doc/src/commands/cargo-run.md @@ -65,7 +65,7 @@ for more details.
-
-f features
+
-F features
--features features
Space or comma separated list of features to activate. Features of workspace members may be enabled with package-name/feature-name syntax. This flag may