Skip to content

Commit 595abfd

Browse files
authored
Rollup merge of rust-lang#58115 - h-michael:rustdoc-2018, r=Centril
Transition rustdoc to 2018 edition Transitions rustdoc to Rust 2018; cc rust-lang#58099
2 parents a890879 + a6f2f7f commit 595abfd

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/tools/rustdoc/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "rustdoc-tool"
33
version = "0.0.0"
44
authors = ["The Rust Project Developers"]
5+
edition = "2018"
56

67
# Cargo adds a number of paths to the dylib search path on windows, which results in
78
# the wrong rustdoc being executed. To avoid the conflicting rustdocs, we name the "tool"

src/tools/rustdoc/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![deny(rust_2018_idioms)]
2+
13
#![feature(link_args)]
24

35
#[allow(unused_attributes)]
@@ -10,6 +12,4 @@
1012
// See src/rustc/rustc.rs for the corresponding rustc settings.
1113
extern {}
1214

13-
extern crate rustdoc;
14-
1515
fn main() { rustdoc::main() }

0 commit comments

Comments
 (0)