diff options
| author | bors <bors@rust-lang.org> | 2018-10-24 19:58:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-24 19:58:23 +0000 |
| commit | da5f414c2c0bfe5198934493f04c676e2b23ff2e (patch) | |
| tree | 77e27fd6f1bcc0912e4a1085ddfc6f5c9861ecfc /src/doc | |
| parent | f33946f81adec4739b84975805dcdeeb77f5a039 (diff) | |
| parent | 4a0c8d12f73e93af70e363fced9f335d26eb149d (diff) | |
| download | rust-1.30.0.tar.gz rust-1.30.0.zip | |
Auto merge of #55315 - pietroalbini:release-1.30.0, r=Mark-Simulacrum 1.30.0
Stable release 1.30 This PR also reverts the stabilization of `non_modrs_mods` and the 2018 edition. r? @Mark-Simulacrum cc @rust-lang/release
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rustdoc/src/command-line-arguments.md | 14 | ||||
| -rw-r--r-- | src/doc/rustdoc/src/unstable-features.md | 13 |
2 files changed, 13 insertions, 14 deletions
diff --git a/src/doc/rustdoc/src/command-line-arguments.md b/src/doc/rustdoc/src/command-line-arguments.md index aba485f752a..417608cc5ca 100644 --- a/src/doc/rustdoc/src/command-line-arguments.md +++ b/src/doc/rustdoc/src/command-line-arguments.md @@ -345,17 +345,3 @@ $ rustdoc src/lib.rs --sysroot /path/to/sysroot Similar to `rustc --sysroot`, this lets you change the sysroot `rustdoc` uses when compiling your code. - -### `--edition`: control the edition of docs and doctests - -Using this flag looks like this: - -```bash -$ rustdoc src/lib.rs --edition 2018 -$ rustdoc --test src/lib.rs --edition 2018 -``` - -This flag allows rustdoc to treat your rust code as the given edition. It will compile doctests with -the given edition as well. As with `rustc`, the default edition that `rustdoc` will use is `2015` -(the first edition). - diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md index 071575b1fc0..32fb8c2f7d5 100644 --- a/src/doc/rustdoc/src/unstable-features.md +++ b/src/doc/rustdoc/src/unstable-features.md @@ -346,6 +346,19 @@ details. [issue-display-warnings]: https://github.com/rust-lang/rust/issues/41574 +### `--edition`: control the edition of docs and doctests + +Using this flag looks like this: + +```bash +$ rustdoc src/lib.rs -Z unstable-options --edition 2018 +$ rustdoc --test src/lib.rs -Z unstable-options --edition 2018 +``` + +This flag allows rustdoc to treat your rust code as the given edition. It will compile doctests with +the given edition as well. As with `rustc`, the default edition that `rustdoc` will use is `2015` +(the first edition). + ### `--extern-html-root-url`: control how rustdoc links to non-local crates Using this flag looks like this: |