diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-02-09 00:15:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-09 00:15:46 +0100 |
| commit | f67477901215d90e8be137606f58f2ea9f0d40e0 (patch) | |
| tree | a57822d9c00ed7fcd6e2adb1a85c5ef8696b047c /src/tools | |
| parent | dbd73f640fc49b447c7e8c9e888fe238c3c714df (diff) | |
| parent | a6f2f7f15e4c4c24f9091bbbb8c56952c15ab70a (diff) | |
| download | rust-f67477901215d90e8be137606f58f2ea9f0d40e0.tar.gz rust-f67477901215d90e8be137606f58f2ea9f0d40e0.zip | |
Rollup merge of #58115 - h-michael:rustdoc-2018, r=Centril
Transition rustdoc to 2018 edition Transitions rustdoc to Rust 2018; cc #58099
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rustdoc/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/tools/rustdoc/main.rs | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/rustdoc/Cargo.toml b/src/tools/rustdoc/Cargo.toml index d3881500441..36aa5916da7 100644 --- a/src/tools/rustdoc/Cargo.toml +++ b/src/tools/rustdoc/Cargo.toml @@ -2,6 +2,7 @@ name = "rustdoc-tool" version = "0.0.0" authors = ["The Rust Project Developers"] +edition = "2018" # Cargo adds a number of paths to the dylib search path on windows, which results in # the wrong rustdoc being executed. To avoid the conflicting rustdocs, we name the "tool" diff --git a/src/tools/rustdoc/main.rs b/src/tools/rustdoc/main.rs index df9d2c6ba96..8bdc365c4ca 100644 --- a/src/tools/rustdoc/main.rs +++ b/src/tools/rustdoc/main.rs @@ -1,3 +1,5 @@ +#![deny(rust_2018_idioms)] + #![feature(link_args)] #[allow(unused_attributes)] @@ -10,6 +12,4 @@ // See src/rustc/rustc.rs for the corresponding rustc settings. extern {} -extern crate rustdoc; - fn main() { rustdoc::main() } |