Cancel errors during interface::parse_cfg/parse_check_cfg

Author: mu001999

compiler/rustc_interface/src/interface.rs

@@ -97,12 +97,12 @@ pub(crate) fn parse_cfg(dcx: DiagCtxtHandle<'_>, cfgs: Vec<String>) -> Cfg {
                         }
                         Ok(..) => {}
                         Err(err) => {
-                            err.emit();
+                            err.cancel();
                         },
                     }
                 },
                 Err(errs) => errs.into_iter().for_each(|err| {
-                    err.emit();
+                    err.cancel();
                 }),
             };
 
@@ -184,21 +184,20 @@ pub(crate) fn parse_check_cfg(dcx: DiagCtxtHandle<'_>, specs: Vec<String>) -> Ch
         let mut parser =
             match new_parser_from_source_str(&psess, filename, s.to_string(), StripTokens::Nothing)
             {
-                Ok(parser) => parser,
+                Ok(parser) => parser.recovery(Recovery::Forbidden),
                 Err(errs) => {
                     errs.into_iter().for_each(|err| {
-                        err.emit();
+                        err.cancel();
                     });
                     expected_error();
                 }
             };
-        parser = parser.recovery(Recovery::Forbidden);
 
         let meta_item = match parser.parse_meta_item(AllowLeadingUnsafe::No) {
             Ok(meta_item) if parser.token == token::Eof => meta_item,
             Ok(..) => expected_error(),
             Err(err) => {
-                err.emit();
+                err.cancel();
                 expected_error();
             }
         };

tests/run-make/multiline-args-value/cfg-frontmatter.stderr

@@ -1,9 +1,3 @@
-error: expected identifier, found `-`
-  |
-  = note: this error occurred on the command line: `--cfg=---
-          ---
-          key`
-
 error: invalid `--cfg` argument: `---
        ---
        key` (expected `key` or `key="value"`)

tests/run-make/multiline-args-value/cfg-shebang.stderr

@@ -1,8 +1,3 @@
-error: expected identifier, found `#`
-  |
-  = note: this error occurred on the command line: `--cfg=#!/usr/bin/shebang
-          key`
-
 error: invalid `--cfg` argument: `#!/usr/bin/shebang
        key` (expected `key` or `key="value"`)
 

tests/run-make/multiline-args-value/check-cfg-frontmatter.stderr

@@ -1,9 +1,3 @@
-error: expected identifier, found `-`
-  |
-  = note: this error occurred on the command line: `--check-cfg=---
-          ---
-          cfg(key)`
-
 error: invalid `--check-cfg` argument: `---
        ---
        cfg(key)`

tests/run-make/multiline-args-value/check-cfg-shebang.stderr

@@ -1,8 +1,3 @@
-error: expected identifier, found `#`
-  |
-  = note: this error occurred on the command line: `--check-cfg=#!/usr/bin/shebang
-          cfg(key)`
-
 error: invalid `--check-cfg` argument: `#!/usr/bin/shebang
        cfg(key)`
   |

tests/ui/cfg/path-kw-as-cfg-pred-cli-cfg.cfg_priv.stderr

@@ -1,6 +1,2 @@
-error: expected identifier, found reserved keyword `priv`
-  |
-  = note: this error occurred on the command line: `--cfg=priv`
-
 error: invalid `--cfg` argument: `priv` (expected `key` or `key="value"`)
 

tests/ui/cfg/path-kw-as-cfg-pred-cli-cfg.cfg_struct.stderr

@@ -1,6 +1,2 @@
-error: expected identifier, found keyword `struct`
-  |
-  = note: this error occurred on the command line: `--cfg=struct`
-
 error: invalid `--cfg` argument: `struct` (expected `key` or `key="value"`)
 

tests/ui/cfg/path-kw-as-cfg-pred-cli-cfg.cfg_underscore.stderr

@@ -1,6 +1,2 @@
-error: expected identifier, found reserved identifier `_`
-  |
-  = note: this error occurred on the command line: `--cfg=_`
-
 error: invalid `--cfg` argument: `_` (expected `key` or `key="value"`)
 

tests/ui/cfg/path-kw-as-cfg-pred-cli-check-cfg.check_cfg_priv.stderr

@@ -1,7 +1,3 @@
-error: expected unsuffixed literal, found reserved keyword `priv`
-  |
-  = note: this error occurred on the command line: `--check-cfg=cfg(priv)`
-
 error: invalid `--check-cfg` argument: `cfg(priv)`
    |
    = note: expected `cfg(name, values("value1", "value2", ... "valueN"))`

tests/ui/cfg/path-kw-as-cfg-pred-cli-check-cfg.check_cfg_struct.stderr

@@ -1,7 +1,3 @@
-error: expected unsuffixed literal, found keyword `struct`
-  |
-  = note: this error occurred on the command line: `--check-cfg=cfg(struct)`
-
 error: invalid `--check-cfg` argument: `cfg(struct)`
    |
    = note: expected `cfg(name, values("value1", "value2", ... "valueN"))`