bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename debugging_opts to unstable_opts

Browse source 
This is no longer used only for debugging options (e.g. `-Zoutput-width`, `-Zallow-features`).
Rename it to be more clear.
This commit is contained in:
Joshua Nelson 2022-07-06 07:44:47 -05:00
parent c80dde43f9
commit 3c9765cff1
125 changed files with 396 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

28
compiler/rustc_driver/src/lib.rs
View file

@ -29,7 +29,7 @@ use rustc_log::stdout_isatty;
use rustc_metadata::locator;
use rustc_save_analysis as save;
use rustc_save_analysis::DumpHandler;
use rustc_session::config::{nightly_options, CG_OPTIONS, DB_OPTIONS};
use rustc_session::config::{nightly_options, CG_OPTIONS, Z_OPTIONS};
use rustc_session::config::{ErrorOutputType, Input, OutputType, PrintRequest, TrimmedDefPaths};
use rustc_session::cstore::MetadataLoader;
use rustc_session::getopts;
@ -124,7 +124,7 @@ impl Callbacks for TimePassesCallbacks {
// If a --prints=... option has been given, we don't print the "total"
// time because it will mess up the --prints output. See #64339.
self.time_passes = config.opts.prints.is_empty()
&& (config.opts.debugging_opts.time_passes || config.opts.debugging_opts.time);
&& (config.opts.unstable_opts.time_passes || config.opts.unstable_opts.time);
config.opts.trimmed_def_paths = TrimmedDefPaths::GoodPath;
}
}
@ -248,7 +248,7 @@ fn run_compiler(
let sopts = &compiler.session().opts;
if sopts.describe_lints {
let mut lint_store = rustc_lint::new_lint_store(
sopts.debugging_opts.no_interleave_lints,
sopts.unstable_opts.no_interleave_lints,
compiler.session().unstable_options(),
);
let registered_lints =
@ -342,7 +342,7 @@ fn run_compiler(
return early_exit();
}
if sess.opts.debugging_opts.parse_only || sess.opts.debugging_opts.show_span.is_some() {
if sess.opts.unstable_opts.parse_only || sess.opts.unstable_opts.show_span.is_some() {
return early_exit();
}
@ -371,13 +371,13 @@ fn run_compiler(
queries.global_ctxt()?;
if sess.opts.debugging_opts.no_analysis {
if sess.opts.unstable_opts.no_analysis {
return early_exit();
}
queries.global_ctxt()?.peek_mut().enter(|tcx| {
let result = tcx.analysis(());
if sess.opts.debugging_opts.save_analysis {
if sess.opts.unstable_opts.save_analysis {
let crate_name = queries.crate_name()?.peek().clone();
sess.time("save_analysis", || {
save::process_crate(
@ -401,7 +401,7 @@ fn run_compiler(
queries.ongoing_codegen()?;
if sess.opts.debugging_opts.print_type_sizes {
if sess.opts.unstable_opts.print_type_sizes {
sess.code_stats.print_type_sizes();
}
@ -414,14 +414,14 @@ fn run_compiler(
linker.link()?
}
if sess.opts.debugging_opts.perf_stats {
if sess.opts.unstable_opts.perf_stats {
sess.print_perf_stats();
}
if sess.opts.debugging_opts.print_fuel.is_some() {
if sess.opts.unstable_opts.print_fuel.is_some() {
eprintln!(
"Fuel used by {}: {}",
sess.opts.debugging_opts.print_fuel.as_ref().unwrap(),
sess.opts.unstable_opts.print_fuel.as_ref().unwrap(),
sess.print_fuel.load(SeqCst)
);
}
@ -576,7 +576,7 @@ fn show_content_with_pager(content: &str) {
}
pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Compilation {
if sess.opts.debugging_opts.link_only {
if sess.opts.unstable_opts.link_only {
if let Input::File(file) = compiler.input() {
// FIXME: #![crate_type] and #![crate_name] support not implemented yet
sess.init_crate_types(collect_crate_types(sess, &[]));
@ -606,7 +606,7 @@ pub fn list_metadata(
metadata_loader: &dyn MetadataLoader,
input: &Input,
) -> Compilation {
if sess.opts.debugging_opts.ls {
if sess.opts.unstable_opts.ls {
match *input {
Input::File(ref ifile) => {
let path = &(*ifile);
@ -928,7 +928,7 @@ Available lint options:
fn describe_debug_flags() {
println!("\nAvailable options:\n");
print_flag_list("-Z", config::DB_OPTIONS);
print_flag_list("-Z", config::Z_OPTIONS);
}
fn describe_codegen_flags() {
@ -1000,7 +1000,7 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
getopts::Fail::UnrecognizedOption(ref opt) => CG_OPTIONS
.iter()
.map(|&(name, ..)| ('C', name))
.chain(DB_OPTIONS.iter().map(|&(name, ..)| ('Z', name)))
.chain(Z_OPTIONS.iter().map(|&(name, ..)| ('Z', name)))
.find(|&(_, name)| *opt == name.replace('_', "-"))
.map(|(flag, _)| format!("{}. Did you mean `-{} {}`?", e, flag, opt)),
_ => None,