session: output-width -> diagnostic-width
Rename the `--output-width` flag to `--diagnostic-width` as this appears to be the preferred name within the compiler team. Signed-off-by: David Wood <david.wood@huawei.com>
This commit is contained in:
David Wood
parent
cd23af6793
commit
44c1fcc04d
29 changed files with 48 additions and 48 deletions
|
|
@ -63,7 +63,7 @@ impl HumanReadableErrorType {
|
|||
bundle: Option<Lrc<FluentBundle>>,
|
||||
fallback_bundle: LazyFallbackBundle,
|
||||
teach: bool,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
) -> EmitterWriter {
|
||||
let (short, color_config) = self.unzip();
|
||||
|
|
@ -76,7 +76,7 @@ impl HumanReadableErrorType {
|
|||
short,
|
||||
teach,
|
||||
color,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
macro_backtrace,
|
||||
)
|
||||
}
|
||||
|
|
@ -710,7 +710,7 @@ pub struct EmitterWriter {
|
|||
short_message: bool,
|
||||
teach: bool,
|
||||
ui_testing: bool,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
|
||||
macro_backtrace: bool,
|
||||
}
|
||||
|
|
@ -730,7 +730,7 @@ impl EmitterWriter {
|
|||
fallback_bundle: LazyFallbackBundle,
|
||||
short_message: bool,
|
||||
teach: bool,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
) -> EmitterWriter {
|
||||
let dst = Destination::from_stderr(color_config);
|
||||
|
|
@ -742,7 +742,7 @@ impl EmitterWriter {
|
|||
short_message,
|
||||
teach,
|
||||
ui_testing: false,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
macro_backtrace,
|
||||
}
|
||||
}
|
||||
|
|
@ -755,7 +755,7 @@ impl EmitterWriter {
|
|||
short_message: bool,
|
||||
teach: bool,
|
||||
colored: bool,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
) -> EmitterWriter {
|
||||
EmitterWriter {
|
||||
|
|
@ -766,7 +766,7 @@ impl EmitterWriter {
|
|||
short_message,
|
||||
teach,
|
||||
ui_testing: false,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
macro_backtrace,
|
||||
}
|
||||
}
|
||||
|
|
@ -1615,7 +1615,7 @@ impl EmitterWriter {
|
|||
width_offset + annotated_file.multiline_depth + 1
|
||||
};
|
||||
|
||||
let column_width = if let Some(width) = self.output_width {
|
||||
let column_width = if let Some(width) = self.diagnostic_width {
|
||||
width.saturating_sub(code_offset)
|
||||
} else if self.ui_testing {
|
||||
DEFAULT_COLUMN_WIDTH
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ pub struct JsonEmitter {
|
|||
pretty: bool,
|
||||
ui_testing: bool,
|
||||
json_rendered: HumanReadableErrorType,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
}
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ impl JsonEmitter {
|
|||
fallback_bundle: LazyFallbackBundle,
|
||||
pretty: bool,
|
||||
json_rendered: HumanReadableErrorType,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
) -> JsonEmitter {
|
||||
JsonEmitter {
|
||||
|
|
@ -66,7 +66,7 @@ impl JsonEmitter {
|
|||
pretty,
|
||||
ui_testing: false,
|
||||
json_rendered,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
macro_backtrace,
|
||||
}
|
||||
}
|
||||
|
|
@ -76,7 +76,7 @@ impl JsonEmitter {
|
|||
json_rendered: HumanReadableErrorType,
|
||||
fluent_bundle: Option<Lrc<FluentBundle>>,
|
||||
fallback_bundle: LazyFallbackBundle,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
) -> JsonEmitter {
|
||||
let file_path_mapping = FilePathMapping::empty();
|
||||
|
|
@ -87,7 +87,7 @@ impl JsonEmitter {
|
|||
fallback_bundle,
|
||||
pretty,
|
||||
json_rendered,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
macro_backtrace,
|
||||
)
|
||||
}
|
||||
|
|
@ -100,7 +100,7 @@ impl JsonEmitter {
|
|||
fallback_bundle: LazyFallbackBundle,
|
||||
pretty: bool,
|
||||
json_rendered: HumanReadableErrorType,
|
||||
output_width: Option<usize>,
|
||||
diagnostic_width: Option<usize>,
|
||||
macro_backtrace: bool,
|
||||
) -> JsonEmitter {
|
||||
JsonEmitter {
|
||||
|
|
@ -112,7 +112,7 @@ impl JsonEmitter {
|
|||
pretty,
|
||||
ui_testing: false,
|
||||
json_rendered,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
macro_backtrace,
|
||||
}
|
||||
}
|
||||
|
|
@ -345,7 +345,7 @@ impl Diagnostic {
|
|||
je.fluent_bundle.clone(),
|
||||
je.fallback_bundle.clone(),
|
||||
false,
|
||||
je.output_width,
|
||||
je.diagnostic_width,
|
||||
je.macro_backtrace,
|
||||
)
|
||||
.ui_testing(je.ui_testing)
|
||||
|
|
|
|||
|
|
@ -726,7 +726,7 @@ impl Default for Options {
|
|||
prints: Vec::new(),
|
||||
cg: Default::default(),
|
||||
error_format: ErrorOutputType::default(),
|
||||
output_width: None,
|
||||
diagnostic_width: None,
|
||||
externs: Externs(BTreeMap::new()),
|
||||
crate_name: None,
|
||||
libs: Vec::new(),
|
||||
|
|
@ -1430,8 +1430,8 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
|
|||
),
|
||||
opt::opt_s(
|
||||
"",
|
||||
"output-width",
|
||||
"Inform rustc of the width of the output so that errors can be truncated to fit",
|
||||
"diagnostic-width",
|
||||
"Inform rustc of the width of the output so that diagnostics can be truncated to fit",
|
||||
"WIDTH",
|
||||
),
|
||||
opt::multi_s(
|
||||
|
|
@ -2209,8 +2209,8 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
|
|||
|
||||
let error_format = parse_error_format(matches, color, json_rendered);
|
||||
|
||||
let output_width = matches.opt_get("output-width").unwrap_or_else(|_| {
|
||||
early_error(error_format, "`--output-width` must be an positive integer");
|
||||
let diagnostic_width = matches.opt_get("diagnostic-width").unwrap_or_else(|_| {
|
||||
early_error(error_format, "`--diagnostic-width` must be an positive integer");
|
||||
});
|
||||
|
||||
let unparsed_crate_types = matches.opt_strs("crate-type");
|
||||
|
|
@ -2485,7 +2485,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
|
|||
prints,
|
||||
cg,
|
||||
error_format,
|
||||
output_width,
|
||||
diagnostic_width,
|
||||
externs,
|
||||
unstable_features: UnstableFeatures::from_environment(crate_name.as_deref()),
|
||||
crate_name,
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ top_level_options!(
|
|||
|
||||
test: bool [TRACKED],
|
||||
error_format: ErrorOutputType [UNTRACKED],
|
||||
output_width: Option<usize> [UNTRACKED],
|
||||
diagnostic_width: Option<usize> [UNTRACKED],
|
||||
|
||||
/// If `Some`, enable incremental compilation, using the given
|
||||
/// directory to store intermediate results.
|
||||
|
|
@ -1389,7 +1389,7 @@ options! {
|
|||
"panic strategy for out-of-memory handling"),
|
||||
osx_rpath_install_name: bool = (false, parse_bool, [TRACKED],
|
||||
"pass `-install_name @rpath/...` to the macOS linker (default: no)"),
|
||||
output_width: Option<usize> = (None, parse_opt_number, [UNTRACKED],
|
||||
diagnostic_width: Option<usize> = (None, parse_opt_number, [UNTRACKED],
|
||||
"set the current output width for diagnostic truncation"),
|
||||
panic_abort_tests: bool = (false, parse_bool, [TRACKED],
|
||||
"support compiling tests with panic=abort (default: no)"),
|
||||
|
|
|
|||
|
|
@ -1162,7 +1162,7 @@ fn default_emitter(
|
|||
fallback_bundle,
|
||||
short,
|
||||
sopts.debugging_opts.teach,
|
||||
sopts.output_width,
|
||||
sopts.diagnostic_width,
|
||||
macro_backtrace,
|
||||
),
|
||||
Some(dst) => EmitterWriter::new(
|
||||
|
|
@ -1173,7 +1173,7 @@ fn default_emitter(
|
|||
short,
|
||||
false, // no teach messages when writing to a buffer
|
||||
false, // no colors when writing to a buffer
|
||||
None, // no terminal width
|
||||
None, // no diagnostic width
|
||||
macro_backtrace,
|
||||
),
|
||||
};
|
||||
|
|
@ -1188,7 +1188,7 @@ fn default_emitter(
|
|||
fallback_bundle,
|
||||
pretty,
|
||||
json_rendered,
|
||||
sopts.output_width,
|
||||
sopts.diagnostic_width,
|
||||
macro_backtrace,
|
||||
)
|
||||
.ui_testing(sopts.debugging_opts.ui_testing),
|
||||
|
|
@ -1202,7 +1202,7 @@ fn default_emitter(
|
|||
fallback_bundle,
|
||||
pretty,
|
||||
json_rendered,
|
||||
sopts.output_width,
|
||||
sopts.diagnostic_width,
|
||||
macro_backtrace,
|
||||
)
|
||||
.ui_testing(sopts.debugging_opts.ui_testing),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue