Skip to content

Commit 2dcdf1e

Browse files
committed
Auto merge of #11793 - ehuss:unstable-cleanup, r=epage
Some cleanup for unstable docs This cleans up some issues with the unstable docs. See each individual commit for a description.
2 parents 7cba527 + c515e4a commit 2dcdf1e

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

src/doc/src/reference/unstable.md

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,13 @@ Each new feature described below should explain how to use it.
8080
* [binary-dep-depinfo](#binary-dep-depinfo) --- Causes the dep-info file to track binary dependencies.
8181
* [panic-abort-tests](#panic-abort-tests) --- Allows running tests with the "abort" panic strategy.
8282
* [keep-going](#keep-going) --- Build as much as possible rather than aborting on the first error.
83+
* [check-cfg](#check-cfg) --- Compile-time validation of `cfg` expressions.
84+
* [host-config](#host-config) --- Allows setting `[target]`-like configuration settings for host build targets.
85+
* [target-applies-to-host](#target-applies-to-host) --- Alters whether certain flags will be passed to host build targets.
8386
* rustdoc
8487
* [`doctest-in-workspace`](#doctest-in-workspace) --- Fixes workspace-relative paths when running doctests.
8588
* [rustdoc-map](#rustdoc-map) --- Provides mappings for documentation to link to external sites like [docs.rs](https://docs.rs/).
89+
* [scrape-examples](#scrape-examples) --- Shows examples within documentation.
8690
* `Cargo.toml` extensions
8791
* [Profile `rustflags` option](#profile-rustflags-option) --- Passed directly to rustc.
8892
* [codegen-backend](#codegen-backend) --- Select the codegen backend used by rustc.
@@ -235,20 +239,6 @@ information from `.cargo/config.toml`. See the rustc issue for more information.
235239
cargo test --target foo -Zdoctest-xcompile
236240
```
237241

238-
#### New `dir-name` attribute
239-
240-
Some of the paths generated under `target/` have resulted in a de-facto "build
241-
protocol", where `cargo` is invoked as a part of a larger project build. So, to
242-
preserve the existing behavior, there is also a new attribute `dir-name`, which
243-
when left unspecified, defaults to the name of the profile. For example:
244-
245-
```toml
246-
[profile.release-lto]
247-
inherits = "release"
248-
dir-name = "lto" # Emits to target/lto instead of target/release-lto
249-
lto = true
250-
```
251-
252242
### Build-plan
253243
* Tracking Issue: [#5579](https://github.com/rust-lang/cargo/issues/5579)
254244

@@ -1238,7 +1228,7 @@ println!("cargo:rustc-check-cfg=names(foo, bar)");
12381228
cargo check -Z unstable-options -Z check-cfg=output
12391229
```
12401230

1241-
### `cargo:rustc-check-cfg=CHECK_CFG`
1231+
#### `cargo:rustc-check-cfg=CHECK_CFG`
12421232

12431233
The `rustc-check-cfg` instruction tells Cargo to pass the given value to the
12441234
`--check-cfg` flag to the compiler. This may be used for compile-time

0 commit comments

Comments
 (0)