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
2 changes: 1 addition & 1 deletion compiler/rustc_errors/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ struct DiagCtxtInner {
/// stored along side the main panic backtrace.
ice_file: Option<PathBuf>,

/// Controlled by `-Z lint-rust-version`; this allows avoiding emitting lints which would raise MSRV.
/// Controlled by `-Z hint-msrv`; this allows avoiding emitting lints which would raise MSRV.
msrv: Option<RustcVersion>,
}

Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_session/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2400,6 +2400,8 @@ options! {
"allow deducing higher-ranked outlives assumptions from coroutines when proving auto traits"),
hint_mostly_unused: bool = (false, parse_bool, [TRACKED],
"hint that most of this crate will go unused, to minimize work for uncalled functions"),
hint_msrv: Option<RustcVersion> = (None, parse_rust_version, [TRACKED],
"control the minimum rust version for lints"),
human_readable_cgu_names: bool = (false, parse_bool, [TRACKED],
"generate human-readable, predictable names for codegen units (default: no)"),
identify_regions: bool = (false, parse_bool, [UNTRACKED],
Expand Down Expand Up @@ -2468,8 +2470,6 @@ options! {
"lint LLVM IR (default: no)"),
lint_mir: bool = (false, parse_bool, [UNTRACKED],
"lint MIR before and after each transformation"),
lint_rust_version: Option<RustcVersion> = (None, parse_rust_version, [TRACKED],
"control the minimum rust version for lints"),
llvm_module_flag: Vec<(String, u32, String)> = (Vec::new(), parse_llvm_module_flag, [TRACKED],
"a list of module flags to pass to LLVM (space separated)"),
llvm_plugins: Vec<String> = (Vec::new(), parse_list, [TRACKED],
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_session/src/session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ pub fn build_session(
dcx = dcx.with_ice_file(ice_file);
}

if let Some(msrv) = sopts.unstable_opts.lint_rust_version {
if let Some(msrv) = sopts.unstable_opts.hint_msrv {
dcx = dcx.with_msrv(msrv);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# `lint-rust-version`
# `hint-msrv`

The tracking issue for this feature is: [#157574](https://github.com/rust-lang/rust/issues/157574).

Expand Down
Loading