Skip to content

Commit

Permalink
Rollup merge of rust-lang#58115 - h-michael:rustdoc-2018, r=Centril
Browse files Browse the repository at this point in the history
Transition rustdoc to 2018 edition

Transitions rustdoc to Rust 2018; cc rust-lang#58099
  • Loading branch information
Centril authored Feb 8, 2019
2 parents dbd73f6 + a6f2f7f commit f674779
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/tools/rustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/tools/rustdoc/main.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![deny(rust_2018_idioms)]

#![feature(link_args)]

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

extern crate rustdoc;

fn main() { rustdoc::main() }

0 comments on commit f674779

Please sign in to comment.