Skip to content

Commit bf6b5b9

Browse files
committed
Auto merge of #150577 - wesleywiser:cleanup_debuginfo_compression, r=mati865
Cleanup `debuginfo_compression` unstable flag It isn't necessary to declare the option as a top-level flag when it is accessible from `unstable_opts`. cc #120953
2 parents 1b43252 + f74896f commit bf6b5b9

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

compiler/rustc_codegen_llvm/src/back/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ pub(crate) fn target_machine_factory(
250250

251251
let use_emulated_tls = matches!(sess.tls_model(), TlsModel::Emulated);
252252

253-
let debuginfo_compression = match sess.opts.debuginfo_compression {
253+
let debuginfo_compression = match sess.opts.unstable_opts.debuginfo_compression {
254254
config::DebugInfoCompression::None => llvm::CompressionKind::None,
255255
config::DebugInfoCompression::Zlib => {
256256
if llvm::LLVMRustLLVMHasZlibCompression() {

compiler/rustc_session/src/config.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,6 @@ impl Default for Options {
13761376
crate_types: Vec::new(),
13771377
optimize: OptLevel::No,
13781378
debuginfo: DebugInfo::None,
1379-
debuginfo_compression: DebugInfoCompression::None,
13801379
lint_opts: Vec::new(),
13811380
lint_cap: None,
13821381
describe_lints: false,
@@ -2639,7 +2638,6 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
26392638
// for more details.
26402639
let debug_assertions = cg.debug_assertions.unwrap_or(opt_level == OptLevel::No);
26412640
let debuginfo = select_debuginfo(matches, &cg);
2642-
let debuginfo_compression = unstable_opts.debuginfo_compression;
26432641

26442642
if !unstable_options_enabled {
26452643
if let Err(error) = cg.linker_features.check_unstable_variants(&target_triple) {
@@ -2747,7 +2745,6 @@ pub fn build_session_options(early_dcx: &mut EarlyDiagCtxt, matches: &getopts::M
27472745
crate_types,
27482746
optimize: opt_level,
27492747
debuginfo,
2750-
debuginfo_compression,
27512748
lint_opts,
27522749
lint_cap,
27532750
describe_lints,

compiler/rustc_session/src/options.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ top_level_options!(
397397
/// can influence whether overflow checks are done or not.
398398
debug_assertions: bool [TRACKED],
399399
debuginfo: DebugInfo [TRACKED],
400-
debuginfo_compression: DebugInfoCompression [TRACKED],
401400
lint_opts: Vec<(String, lint::Level)> [TRACKED_NO_CRATE_HASH],
402401
lint_cap: Option<lint::Level> [TRACKED_NO_CRATE_HASH],
403402
describe_lints: bool [UNTRACKED],

0 commit comments

Comments
 (0)