diff options
Diffstat (limited to 'src/tools/cargo/src/etc')
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-add.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-bench.1 | 4 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-build.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-check.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-doc.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-fix.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-init.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-install.1 | 4 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-login.1 | 4 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-new.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-run.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-rustc.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-rustdoc.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-test.1 | 2 | ||||
-rw-r--r-- | src/tools/cargo/src/etc/man/cargo-vendor.1 | 16 |
15 files changed, 32 insertions, 18 deletions
diff --git a/src/tools/cargo/src/etc/man/cargo-add.1 b/src/tools/cargo/src/etc/man/cargo-add.1 index f69e6d0db..4e8b68566 100644 --- a/src/tools/cargo/src/etc/man/cargo-add.1 +++ b/src/tools/cargo/src/etc/man/cargo-add.1 @@ -44,7 +44,7 @@ If no source is specified, then a best effort will be made to select one, includ .sp When you add a package that is already present, the existing entry will be updated with the flags specified. .sp -Upon successful invocation, the enabled (\fB+\fR) and disabled (\fB\-\fR) \fIfeatures\fR <https://doc.rust\-lang.org/cargo/reference/features.md> of the specified +Upon successful invocation, the enabled (\fB+\fR) and disabled (\fB\-\fR) \fIfeatures\fR <https://doc.rust\-lang.org/cargo/reference/features.html> of the specified dependency will be listed in the command\[cq]s output. .SH "OPTIONS" .SS "Source options" diff --git a/src/tools/cargo/src/etc/man/cargo-bench.1 b/src/tools/cargo/src/etc/man/cargo-bench.1 index 64498c4d6..0f5a993e0 100644 --- a/src/tools/cargo/src/etc/man/cargo-bench.1 +++ b/src/tools/cargo/src/etc/man/cargo-bench.1 @@ -32,7 +32,7 @@ Benchmarks are built with the \fB\-\-test\fR option to \fBrustc\fR which creates special executable by linking your code with libtest. The executable automatically runs all functions annotated with the \fB#[bench]\fR attribute. Cargo passes the \fB\-\-bench\fR flag to the test harness to tell it to run -only benchmarks. +only benchmarks, regardless of whether the harness is libtest or a custom harness. .sp The libtest harness may be disabled by setting \fBharness = false\fR in the target manifest settings, in which case your code will need to provide its own \fBmain\fR @@ -282,7 +282,7 @@ target artifacts are placed in a separate directory. See the \fB\-\-profile\fR \fIname\fR .RS 4 Benchmark with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-build.1 b/src/tools/cargo/src/etc/man/cargo-build.1 index 6bcfe8093..4194d7b77 100644 --- a/src/tools/cargo/src/etc/man/cargo-build.1 +++ b/src/tools/cargo/src/etc/man/cargo-build.1 @@ -188,7 +188,7 @@ See also the \fB\-\-profile\fR option for choosing a specific profile by name. \fB\-\-profile\fR \fIname\fR .RS 4 Build with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-check.1 b/src/tools/cargo/src/etc/man/cargo-check.1 index fdbb84647..43d570058 100644 --- a/src/tools/cargo/src/etc/man/cargo-check.1 +++ b/src/tools/cargo/src/etc/man/cargo-check.1 @@ -190,7 +190,7 @@ test mode which will enable checking tests and enable the \fBtest\fR cfg option. See \fIrustc tests\fR <https://doc.rust\-lang.org/rustc/tests/index.html> for more detail. .sp -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-doc.1 b/src/tools/cargo/src/etc/man/cargo-doc.1 index 2bdd8867b..69f781de6 100644 --- a/src/tools/cargo/src/etc/man/cargo-doc.1 +++ b/src/tools/cargo/src/etc/man/cargo-doc.1 @@ -157,7 +157,7 @@ See also the \fB\-\-profile\fR option for choosing a specific profile by name. \fB\-\-profile\fR \fIname\fR .RS 4 Document with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-fix.1 b/src/tools/cargo/src/etc/man/cargo-fix.1 index 61083f214..1f10f179b 100644 --- a/src/tools/cargo/src/etc/man/cargo-fix.1 +++ b/src/tools/cargo/src/etc/man/cargo-fix.1 @@ -285,7 +285,7 @@ test mode which will enable checking tests and enable the \fBtest\fR cfg option. See \fIrustc tests\fR <https://doc.rust\-lang.org/rustc/tests/index.html> for more detail. .sp -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-init.1 b/src/tools/cargo/src/etc/man/cargo-init.1 index 56d1aca9f..b37622b52 100644 --- a/src/tools/cargo/src/etc/man/cargo-init.1 +++ b/src/tools/cargo/src/etc/man/cargo-init.1 @@ -37,7 +37,7 @@ Create a package with a library target (\fBsrc/lib.rs\fR). \fB\-\-edition\fR \fIedition\fR .RS 4 Specify the Rust edition to use. Default is 2021. -Possible values: 2015, 2018, 2021 +Possible values: 2015, 2018, 2021, 2024 .RE .sp \fB\-\-name\fR \fIname\fR diff --git a/src/tools/cargo/src/etc/man/cargo-install.1 b/src/tools/cargo/src/etc/man/cargo-install.1 index 5ca3180fd..d4d4d3eb6 100644 --- a/src/tools/cargo/src/etc/man/cargo-install.1 +++ b/src/tools/cargo/src/etc/man/cargo-install.1 @@ -114,7 +114,7 @@ will be used, beginning discovery at \fB$PATH/.cargo/config.toml\fR\&. \fB\-\-version\fR \fIversion\fR .RS 4 Specify a version to install. This may be a \fIversion -requirement\fR <https://doc.rust\-lang.org/cargo/reference/specifying\-dependencies.md>, like \fB~1.2\fR, to have Cargo +requirement\fR <https://doc.rust\-lang.org/cargo/reference/specifying\-dependencies.html>, like \fB~1.2\fR, to have Cargo select the newest version from the given requirement. If the version does not have a requirement operator (such as \fB^\fR or \fB~\fR), then it must be in the form \fIMAJOR.MINOR.PATCH\fR, and will install exactly that version; it is \fInot\fR @@ -270,7 +270,7 @@ See also the \fB\-\-profile\fR option for choosing a specific profile by name. \fB\-\-profile\fR \fIname\fR .RS 4 Install with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-login.1 b/src/tools/cargo/src/etc/man/cargo-login.1 index 92b3b3f3c..16f5773fa 100644 --- a/src/tools/cargo/src/etc/man/cargo-login.1 +++ b/src/tools/cargo/src/etc/man/cargo-login.1 @@ -6,12 +6,14 @@ .SH "NAME" cargo\-login \[em] Log in to a registry .SH "SYNOPSIS" -\fBcargo login\fR [\fIoptions\fR] [\fItoken\fR] \[en] [\fIargs\fR] +\fBcargo login\fR [\fIoptions\fR] [\fItoken\fR] [\fB\-\-\fR \fIargs\fR] .SH "DESCRIPTION" This command will run a credential provider to save a token so that commands that require authentication, such as \fBcargo\-publish\fR(1), will be automatically authenticated. .sp +All the arguments following the two dashes (\fB\-\-\fR) are passed to the credential provider. +.sp For the default \fBcargo:token\fR credential provider, the token is saved in \fB$CARGO_HOME/credentials.toml\fR\&. \fBCARGO_HOME\fR defaults to \fB\&.cargo\fR in your home directory. diff --git a/src/tools/cargo/src/etc/man/cargo-new.1 b/src/tools/cargo/src/etc/man/cargo-new.1 index 62e0eb157..f1939a543 100644 --- a/src/tools/cargo/src/etc/man/cargo-new.1 +++ b/src/tools/cargo/src/etc/man/cargo-new.1 @@ -32,7 +32,7 @@ Create a package with a library target (\fBsrc/lib.rs\fR). \fB\-\-edition\fR \fIedition\fR .RS 4 Specify the Rust edition to use. Default is 2021. -Possible values: 2015, 2018, 2021 +Possible values: 2015, 2018, 2021, 2024 .RE .sp \fB\-\-name\fR \fIname\fR diff --git a/src/tools/cargo/src/etc/man/cargo-run.1 b/src/tools/cargo/src/etc/man/cargo-run.1 index 293814674..2ecbbcf65 100644 --- a/src/tools/cargo/src/etc/man/cargo-run.1 +++ b/src/tools/cargo/src/etc/man/cargo-run.1 @@ -94,7 +94,7 @@ See also the \fB\-\-profile\fR option for choosing a specific profile by name. \fB\-\-profile\fR \fIname\fR .RS 4 Run with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-rustc.1 b/src/tools/cargo/src/etc/man/cargo-rustc.1 index 501e9208e..f3535b0f0 100644 --- a/src/tools/cargo/src/etc/man/cargo-rustc.1 +++ b/src/tools/cargo/src/etc/man/cargo-rustc.1 @@ -194,7 +194,7 @@ tests\fR <https://doc.rust\-lang.org/rustc/tests/index.html> for more detail. similar to the \fBtest\fR profile. .RE .sp -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-rustdoc.1 b/src/tools/cargo/src/etc/man/cargo-rustdoc.1 index 0335d6e54..72a182de8 100644 --- a/src/tools/cargo/src/etc/man/cargo-rustdoc.1 +++ b/src/tools/cargo/src/etc/man/cargo-rustdoc.1 @@ -176,7 +176,7 @@ See also the \fB\-\-profile\fR option for choosing a specific profile by name. \fB\-\-profile\fR \fIname\fR .RS 4 Document with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-test.1 b/src/tools/cargo/src/etc/man/cargo-test.1 index 8e460e167..467000147 100644 --- a/src/tools/cargo/src/etc/man/cargo-test.1 +++ b/src/tools/cargo/src/etc/man/cargo-test.1 @@ -309,7 +309,7 @@ See also the \fB\-\-profile\fR option for choosing a specific profile by name. \fB\-\-profile\fR \fIname\fR .RS 4 Test with the given profile. -See the \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. +See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/profiles.html> for more details on profiles. .RE .sp \fB\-\-ignore\-rust\-version\fR diff --git a/src/tools/cargo/src/etc/man/cargo-vendor.1 b/src/tools/cargo/src/etc/man/cargo-vendor.1 index cb46f67cd..67744532e 100644 --- a/src/tools/cargo/src/etc/man/cargo-vendor.1 +++ b/src/tools/cargo/src/etc/man/cargo-vendor.1 @@ -14,8 +14,10 @@ the vendor directory specified by \fB<path>\fR will contain all remote sources f dependencies specified. Additional manifests beyond the default one can be specified with the \fB\-s\fR option. .sp -The \fBcargo vendor\fR command will also print out the configuration necessary -to use the vendored sources, which you will need to add to \fB\&.cargo/config.toml\fR\&. +The configuration necessary to use the vendored sources would be printed to +stdout after \fBcargo vendor\fR completes the vendoring process. +You will need to add or redirect it to your Cargo configuration file, +which is usually \fB\&.cargo/config.toml\fR locally for the current package. .SH "OPTIONS" .SS "Vendor Options" .sp @@ -205,5 +207,15 @@ cargo vendor \-s ../path/to/Cargo.toml .fi .RE .RE +.sp +.RS 4 +\h'-04' 4.\h'+01'Vendor and redirect the necessary vendor configs to a config file. +.sp +.RS 4 +.nf +cargo vendor > path/to/my/cargo/config.toml +.fi +.RE +.RE .SH "SEE ALSO" \fBcargo\fR(1) |