diff options
| author | Tim Neumann <mail@timnn.me> | 2016-09-24 19:26:18 +0200 |
|---|---|---|
| committer | Tim Neumann <mail@timnn.me> | 2016-09-26 07:07:41 +0200 |
| commit | ad81f11b01164d7a9660243d14e9d480e3e4275f (patch) | |
| tree | c846c1eb3dc6d2111534237e147a7d0cfbaf59ab | |
| parent | 3f287efc82e01e7ba4374ef6bb781e5d8461946e (diff) | |
| download | rust-ad81f11b01164d7a9660243d14e9d480e3e4275f.tar.gz rust-ad81f11b01164d7a9660243d14e9d480e3e4275f.zip | |
deduplicate inline is_nightly_build implementations
| -rw-r--r-- | src/librustc/session/config.rs | 5 | ||||
| -rw-r--r-- | src/librustc_driver/lib.rs | 5 | ||||
| -rw-r--r-- | src/librustdoc/html/markdown.rs | 11 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 4e88370931a..d866ead8e3b 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1572,10 +1572,7 @@ pub mod nightly_options { pub fn check_nightly_options(matches: &getopts::Matches, flags: &[RustcOptGroup]) { let has_z_unstable_option = matches.opt_strs("Z").iter().any(|x| *x == "unstable-options"); - let really_allows_unstable_options = match UnstableFeatures::from_environment() { - UnstableFeatures::Disallow => false, - _ => true, - }; + let really_allows_unstable_options = UnstableFeatures::from_environment().is_nightly_build(); for opt in flags.iter() { if opt.stability == OptionStability::Stable { diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 33d57a3127e..df2219b73cd 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -649,10 +649,7 @@ impl RustcDefaultCalls { } } PrintRequest::Cfg => { - let allow_unstable_cfg = match UnstableFeatures::from_environment() { - UnstableFeatures::Disallow => false, - _ => true, - }; + let allow_unstable_cfg = UnstableFeatures::from_environment().is_nightly_build(); for cfg in cfg { if !allow_unstable_cfg && GatedCfg::gate(&*cfg).is_some() { diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index d923c54ecd2..e9a1f650c9b 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -477,13 +477,10 @@ impl LangString { let mut data = LangString::all_false(); let mut allow_compile_fail = false; let mut allow_error_code_check = false; - match UnstableFeatures::from_environment() { - UnstableFeatures::Allow | UnstableFeatures::Cheat => { - allow_compile_fail = true; - allow_error_code_check = true; - } - _ => {}, - }; + if UnstableFeatures::from_environment().is_nightly_build() { + allow_compile_fail = true; + allow_error_code_check = true; + } let tokens = string.split(|c: char| !(c == '_' || c == '-' || c.is_alphanumeric()) |