nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unwrap diag.code directly

Browse Source
This commit is contained in:
r0cky 2024-05-31 08:29:42 +08:00
parent 21e6de7eb6
commit ed5205fe66
3 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs
View File

@ -182,7 +182,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
diag.span_label(p_span, format!("{expected}this type parameter"));
}
diag.help("type parameters must be constrained to match other types");
if tcx.sess.teach(diag.code.unwrap()) {
if diag.code.is_some_and(|code| tcx.sess.teach(code)) {
diag.help(
"given a type parameter `T` and a method `foo`:
```
@ -663,7 +663,7 @@ impl<T> Trait<T> for X {
https://doc.rust-lang.org/book/ch19-03-advanced-traits.html",
);
}
if tcx.sess.teach(diag.code.unwrap()) {
if diag.code.is_some_and(|code| tcx.sess.teach(code)) {
diag.help(
"given an associated type `T` and a method `foo`:
```

19
tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.rs Normal file
View File

@ -0,0 +1,19 @@
#![feature(specialization)]
#![allow(incomplete_features)]
trait Trait {
type Type;
}
impl Trait for i32 {
default type Type = i32;
}
struct Wrapper<const C: <i32 as Trait>::Type> {}
//~^ ERROR `<i32 as Trait>::Type` is forbidden as the type of a const generic parameter
impl<const C: usize> Wrapper<C> {}
//~^ ERROR the constant `C` is not of type `<i32 as Trait>::Type`
//~^^ ERROR mismatched types
fn main() {}

36
tests/ui/specialization/default-proj-ty-as-type-of-const-issue-125757.stderr Normal file
View File

@ -0,0 +1,36 @@
error: `<i32 as Trait>::Type` is forbidden as the type of a const generic parameter
--> $DIR/default-proj-ty-as-type-of-const-issue-125757.rs:12:25
|
LL | struct Wrapper<const C: <i32 as Trait>::Type> {}
| ^^^^^^^^^^^^^^^^^^^^
|
= note: the only supported types are integers, `bool` and `char`
error: the constant `C` is not of type `<i32 as Trait>::Type`
--> $DIR/default-proj-ty-as-type-of-const-issue-125757.rs:15:22
|
LL | impl<const C: usize> Wrapper<C> {}
| ^^^^^^^^^^ expected associated type, found `usize`
|
= help: consider constraining the associated type `<i32 as Trait>::Type` to `usize`
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
note: required by a bound in `Wrapper`
--> $DIR/default-proj-ty-as-type-of-const-issue-125757.rs:12:16
|
LL | struct Wrapper<const C: <i32 as Trait>::Type> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `Wrapper`
error[E0308]: mismatched types
--> $DIR/default-proj-ty-as-type-of-const-issue-125757.rs:15:30
|
LL | impl<const C: usize> Wrapper<C> {}
| ^ expected associated type, found `usize`
|
= note: expected associated type `<i32 as Trait>::Type`
found type `usize`
= help: consider constraining the associated type `<i32 as Trait>::Type` to `usize`
= note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
error: aborting due to 3 previous errors
For more information about this error, try `rustc --explain E0308`.