nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add suggestion for missing compile flag group

Browse Source
This commit is contained in:
Cameron Steffen 2021-06-27 18:15:16 -05:00
parent 3ddb78a346
commit 2a60f090b9
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_driver/src/lib.rs
View File

@ -29,7 +29,7 @@ use rustc_middle::middle::cstore::MetadataLoader;
use rustc_save_analysis as save;
use rustc_save_analysis::DumpHandler;
use rustc_serialize::json::{self, ToJson};
use rustc_session::config::nightly_options;
use rustc_session::config::{nightly_options, CG_OPTIONS, DB_OPTIONS};
use rustc_session::config::{ErrorOutputType, Input, OutputType, PrintRequest, TrimmedDefPaths};
use rustc_session::getopts;
use rustc_session::lint::{Lint, LintId};
@ -1017,9 +1017,18 @@ pub fn handle_options(args: &[String]) -> Option<getopts::Matches> {
for option in config::rustc_optgroups() {
(option.apply)(&mut options);
}
let matches = options
.parse(args)
.unwrap_or_else(|f| early_error(ErrorOutputType::default(), &f.to_string()));
let matches = options.parse(args).unwrap_or_else(|e| {
let msg = match e {
getopts::Fail::UnrecognizedOption(ref opt) => CG_OPTIONS
.iter()
.map(|&(name, ..)| ('C', name))
.chain(DB_OPTIONS.iter().map(|&(name, ..)| ('Z', name)))
.find(|&(_, name)| *opt == name.replace("_", "-"))
.map(|(flag, _)| format!("{}. Did you mean `-{} {}`?", e, flag, opt)),
_ => None,
};
early_error(ErrorOutputType::default(), &msg.unwrap_or_else(|| e.to_string()));
});
// For all options we just parsed, we check a few aspects:
//

1
src/test/ui/invalid-compile-flags/codegen-option-without-group.rs Normal file
View File

@ -0,0 +1 @@
// compile-flags: --llvm-args

2
src/test/ui/invalid-compile-flags/codegen-option-without-group.stderr Normal file
View File

@ -0,0 +1,2 @@
error: Unrecognized option: 'llvm-args'. Did you mean `-C llvm-args`?

1
src/test/ui/invalid-compile-flags/debug-option-without-group.rs Normal file
View File

@ -0,0 +1 @@
// compile-flags: --unpretty=hir

2
src/test/ui/invalid-compile-flags/debug-option-without-group.stderr Normal file
View File

@ -0,0 +1,2 @@
error: Unrecognized option: 'unpretty'. Did you mean `-Z unpretty`?