diff options
| author | bors <bors@rust-lang.org> | 2022-12-01 17:47:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-01 17:47:12 +0000 |
| commit | c090c6880c0183ba248bde4a16e29ba29ac4fbba (patch) | |
| tree | 1555cb75b5510b53b9084d6f7ec626a31f6ee24a /compiler/rustc_session/src/errors.rs | |
| parent | 367ecffe5297260f11e71881125a5589c8cb5350 (diff) | |
| parent | ee9eaa695c22de6ffa1edadc4b98b0c0e2e258f8 (diff) | |
| download | rust-c090c6880c0183ba248bde4a16e29ba29ac4fbba.tar.gz rust-c090c6880c0183ba248bde4a16e29ba29ac4fbba.zip | |
Auto merge of #105125 - matthiaskrgr:rollup-fr0snmj, r=matthiaskrgr
Rollup of 4 pull requests
Successful merges:
- #105078 (Fix `expr_to_spanned_string` ICE)
- #105087 (Extract llvm datalayout parsing out of spec module)
- #105088 (rustdoc: remove redundant CSS `div.desc { display: block }`)
- #105106 (Fix ICE from #105101)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_session/src/errors.rs')
| -rw-r--r-- | compiler/rustc_session/src/errors.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/compiler/rustc_session/src/errors.rs b/compiler/rustc_session/src/errors.rs index 2f7055e3cc5..9aa8a06c6d3 100644 --- a/compiler/rustc_session/src/errors.rs +++ b/compiler/rustc_session/src/errors.rs @@ -197,12 +197,12 @@ pub enum UnleashedFeatureHelp { #[derive(Diagnostic)] #[diag(session_invalid_literal_suffix)] -pub(crate) struct InvalidLiteralSuffix { +pub(crate) struct InvalidLiteralSuffix<'a> { #[primary_span] #[label] pub span: Span, // FIXME(#100717) - pub kind: String, + pub kind: &'a str, pub suffix: Symbol, } @@ -311,11 +311,7 @@ pub fn report_lit_error(sess: &ParseSess, err: LitError, lit: token::Lit, span: LitError::LexerError => {} LitError::InvalidSuffix => { if let Some(suffix) = suffix { - sess.emit_err(InvalidLiteralSuffix { - span, - kind: format!("{}", kind.descr()), - suffix, - }); + sess.emit_err(InvalidLiteralSuffix { span, kind: kind.descr(), suffix }); } } LitError::InvalidIntSuffix => { |
