From 2b09d7cc6455715205e08fedf16d382f49e82152 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 27 Apr 2018 02:24:56 +0200 Subject: [PATCH] stabilize opt-level={s,z} closes #35784 --- src/librustc/session/config.rs | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index ab703d423c61d..e65f9a181f016 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1972,27 +1972,15 @@ pub fn build_session_options_and_crate_config( } OptLevel::Default } else { - match ( - cg.opt_level.as_ref().map(String::as_ref), - nightly_options::is_nightly_build(), - ) { - (None, _) => OptLevel::No, - (Some("0"), _) => OptLevel::No, - (Some("1"), _) => OptLevel::Less, - (Some("2"), _) => OptLevel::Default, - (Some("3"), _) => OptLevel::Aggressive, - (Some("s"), true) => OptLevel::Size, - (Some("z"), true) => OptLevel::SizeMin, - (Some("s"), false) | (Some("z"), false) => { - early_error( - error_format, - &format!( - "the optimizations s or z are only \ - accepted on the nightly compiler" - ), - ); - } - (Some(arg), _) => { + match cg.opt_level.as_ref().map(String::as_ref) { + None => OptLevel::No, + Some("0") => OptLevel::No, + Some("1") => OptLevel::Less, + Some("2") => OptLevel::Default, + Some("3") => OptLevel::Aggressive, + Some("s") => OptLevel::Size, + Some("z") => OptLevel::SizeMin, + Some(arg) => { early_error( error_format, &format!(