diff options
| author | bors <bors@rust-lang.org> | 2023-02-17 01:14:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-17 01:14:39 +0000 |
| commit | ea218392a4ce119c4dfcd8fb94a7fee77f76f2c5 (patch) | |
| tree | 78b5939c0ed6ee6449bb4d7c904d25edd3f05098 /compiler/rustc_session/src/parse.rs | |
| parent | 947b696ce0ce42c98b8fb82ffa0735ade051466c (diff) | |
| parent | ecdb7bcee855107f5edaf29a00dadeed3a23caaa (diff) | |
| download | rust-ea218392a4ce119c4dfcd8fb94a7fee77f76f2c5.tar.gz rust-ea218392a4ce119c4dfcd8fb94a7fee77f76f2c5.zip | |
Auto merge of #108145 - matthiaskrgr:rollup-bgadak1, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #104068 (rustdoc: Add PartialOrd trait to doc comment explanation) - #107489 (Implement partial support for non-lifetime binders) - #107905 (Pass arguments to `x` subcommands with `--`) - #108009 (Move some tests) - #108086 (wasm: Register the `relaxed-simd` target feature) - #108104 (don't into self) - #108133 (Small cleanups around `EarlyBinder`) - #108136 (Do not ICE on unmet trait alias impl bounds) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_session/src/parse.rs')
| -rw-r--r-- | compiler/rustc_session/src/parse.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_session/src/parse.rs b/compiler/rustc_session/src/parse.rs index 2aa8ca9e4a9..cbdcc5581e5 100644 --- a/compiler/rustc_session/src/parse.rs +++ b/compiler/rustc_session/src/parse.rs @@ -88,7 +88,7 @@ pub fn feature_err<'a>( sess: &'a ParseSess, feature: Symbol, span: impl Into<MultiSpan>, - explain: &str, + explain: impl Into<DiagnosticMessage>, ) -> DiagnosticBuilder<'a, ErrorGuaranteed> { feature_err_issue(sess, feature, span, GateIssue::Language, explain) } @@ -103,7 +103,7 @@ pub fn feature_err_issue<'a>( feature: Symbol, span: impl Into<MultiSpan>, issue: GateIssue, - explain: &str, + explain: impl Into<DiagnosticMessage>, ) -> DiagnosticBuilder<'a, ErrorGuaranteed> { let span = span.into(); @@ -114,7 +114,7 @@ pub fn feature_err_issue<'a>( .map(|err| err.cancel()); } - let mut err = sess.create_err(FeatureGateError { span, explain }); + let mut err = sess.create_err(FeatureGateError { span, explain: explain.into() }); add_feature_diagnostics_for_issue(&mut err, sess, feature, issue); err } |
