Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions compiler/rustc_session/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ macro_rules! options {
$parse:ident,
[$dep_tracking_marker:ident $( $tmod:ident )?],
$desc:expr
$(, deprecated_do_nothing: $dnn:literal )?)
$(, is_deprecated_and_do_nothing: $dnn:literal )?)
),* ,) =>
(
#[derive(Clone)]
Expand Down Expand Up @@ -760,7 +760,7 @@ fn build_options<O: Default>(
match value {
None => early_dcx.early_fatal(
format!(
"{outputname} option `{key}` requires {type_desc} ({prefix} {key}=<value>)"
"{outputname} option `{key}` requires {type_desc} (`-{prefix} {key}=<value>`)"
),
),
Some(value) => early_dcx.early_fatal(
Expand Down Expand Up @@ -2059,7 +2059,7 @@ options! {
#[rustc_lint_opt_deny_field_access("documented to do nothing")]
ar: String = (String::new(), parse_string, [UNTRACKED],
"this option is deprecated and does nothing",
deprecated_do_nothing: true),
is_deprecated_and_do_nothing: true),
#[rustc_lint_opt_deny_field_access("use `Session::code_model` instead of this field")]
code_model: Option<CodeModel> = (None, parse_code_model, [TRACKED],
"choose the code model to use (`rustc --print code-models` for details)"),
Expand Down Expand Up @@ -2098,7 +2098,7 @@ options! {
inline_threshold: Option<u32> = (None, parse_opt_number, [UNTRACKED],
"this option is deprecated and does nothing \
(consider using `-Cllvm-args=--inline-threshold=...`)",
deprecated_do_nothing: true),
is_deprecated_and_do_nothing: true),
#[rustc_lint_opt_deny_field_access("use `Session::instrument_coverage` instead of this field")]
instrument_coverage: InstrumentCoverage = (InstrumentCoverage::No, parse_instrument_coverage, [TRACKED],
"instrument the generated code to support LLVM source-based code coverage reports \
Expand Down Expand Up @@ -2139,7 +2139,7 @@ options! {
#[rustc_lint_opt_deny_field_access("documented to do nothing")]
no_stack_check: bool = (false, parse_no_value, [UNTRACKED],
"this option is deprecated and does nothing",
deprecated_do_nothing: true),
is_deprecated_and_do_nothing: true),
no_vectorize_loops: bool = (false, parse_no_value, [TRACKED],
"disable loop vectorization optimization passes"),
no_vectorize_slp: bool = (false, parse_no_value, [TRACKED],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
warning: `-C inline-threshold`: this option is deprecated and does nothing (consider using `-Cllvm-args=--inline-threshold=...`)

error: codegen option `inline-threshold` requires a number (C inline-threshold=<value>)
error: codegen option `inline-threshold` requires a number (`-C inline-threshold=<value>`)

2 changes: 1 addition & 1 deletion tests/ui/panic-runtime/bad-panic-flag2.stderr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: codegen option `panic` requires either `unwind`, `abort`, or `immediate-abort` (C panic=<value>)
error: codegen option `panic` requires either `unwind`, `abort`, or `immediate-abort` (`-C panic=<value>`)

2 changes: 1 addition & 1 deletion tests/ui/runtime/on-broken-pipe/no-flag-arg.stderr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: unstable option `on-broken-pipe` requires either `kill`, `error`, or `inherit` (Z on-broken-pipe=<value>)
error: unstable option `on-broken-pipe` requires either `kill`, `error`, or `inherit` (`-Z on-broken-pipe=<value>`)

2 changes: 1 addition & 1 deletion tests/ui/symbol-mangling-version/bad-value.no-value.stderr
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: codegen option `symbol-mangling-version` requires one of: `legacy`, `v0` (RFC 2603), or `hashed` (C symbol-mangling-version=<value>)
error: codegen option `symbol-mangling-version` requires one of: `legacy`, `v0` (RFC 2603), or `hashed` (`-C symbol-mangling-version=<value>`)

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
error: codegen option `unsafe-allow-abi-mismatch` requires a comma-separated list of strings (C unsafe-allow-abi-mismatch=<value>)
error: codegen option `unsafe-allow-abi-mismatch` requires a comma-separated list of strings (`-C unsafe-allow-abi-mismatch=<value>`)

Loading