diff options
| -rw-r--r-- | components/script_plugins/lib.rs | 3 | ||||
| -rwxr-xr-x | etc/rustdoc-with-private | 12 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs index ec05f697e05..ea2b0fa74a6 100644 --- a/components/script_plugins/lib.rs +++ b/components/script_plugins/lib.rs @@ -21,9 +21,9 @@ #[macro_use] extern crate matches; -#[macro_use] extern crate rustc; extern crate rustc_driver; +extern crate rustc_session; extern crate syntax; use rustc::hir::def_id::DefId; @@ -32,6 +32,7 @@ use rustc::hir::{self, ExprKind, HirId}; use rustc::lint::{LateContext, LateLintPass, LintContext, LintPass}; use rustc::ty; use rustc_driver::plugin::Registry; +use rustc_session::declare_lint; use syntax::ast::{AttrKind, Attribute}; use syntax::source_map; use syntax::source_map::{ExpnKind, MacroKind, Span}; diff --git a/etc/rustdoc-with-private b/etc/rustdoc-with-private index 9d3f33c6295..ea39eb82e5a 100755 --- a/etc/rustdoc-with-private +++ b/etc/rustdoc-with-private @@ -1,8 +1,16 @@ -#!/bin/sh +#!/bin/bash # Emit documentation for private items so it is easier to look # up internal definitions. # # Deny "deny warnings" to ensure documenting the crates # succeeds even if new warnings are introduced to the compiler. -rustdoc -Z "unstable-options" --cap-lints warn --document-private-items "$@" + +if [[ "$*" == *--document-private-items* ]] +then + ARGS="" +else + ARGS="--document-private-items" +fi + +rustdoc -Z "unstable-options" --cap-lints warn $ARGS "$@" diff --git a/rust-toolchain b/rust-toolchain index 3210ed80700..409ca5f4667 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2019-11-16 +nightly-2019-12-04 |