user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix handling of substitutions and binders when deciding whether to suggest references

Browse source 
When suggesting references, substitutions were being forgotten and some types were misused. This led to at
least one ICE and other incorrectly emitted diagnostics. This has been fixed; in some cases this leads to
diagnostics changing, and tests have been adjusted.
This commit is contained in:
Jakob Degen 2021-11-11 18:28:19 -05:00
parent d71ba74f0d
commit d58d52a397
5 changed files with 55 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/test/ui/derives/deriving-copyclone.stderr
View file

@ -1,4 +1,4 @@
error[E0277]: the trait bound `C: Copy` is not satisfied
error[E0277]: the trait bound `B<C>: Copy` is not satisfied
--> $DIR/deriving-copyclone.rs:31:13
|
LL | is_copy(B { a: 1, b: C });
@ -22,7 +22,7 @@ help: consider borrowing here
LL | is_copy(&B { a: 1, b: C });
| +
error[E0277]: the trait bound `C: Clone` is not satisfied
error[E0277]: the trait bound `B<C>: Clone` is not satisfied
--> $DIR/deriving-copyclone.rs:32:14
|
LL | is_clone(B { a: 1, b: C });
@ -46,7 +46,7 @@ help: consider borrowing here
LL | is_clone(&B { a: 1, b: C });
| +
error[E0277]: the trait bound `D: Copy` is not satisfied
error[E0277]: the trait bound `B<D>: Copy` is not satisfied
--> $DIR/deriving-copyclone.rs:35:13
|
LL | is_copy(B { a: 1, b: D });

12
src/test/ui/traits/negative-impls/negated-auto-traits-error.stderr
View file

@ -65,7 +65,7 @@ LL | is_send(Box::new(TestType));
| |
| required by a bound introduced by this call
|
= note: the trait bound `dummy2::TestType: Send` is not satisfied
= note: the trait bound `Unique<dummy2::TestType>: Send` is not satisfied
= note: required because of the requirements on the impl of `Send` for `Unique<dummy2::TestType>`
= note: required because it appears within the type `Box<dummy2::TestType>`
note: required by a bound in `is_send`
@ -104,11 +104,11 @@ error[E0277]: `main::TestType` cannot be sent between threads safely
--> $DIR/negated-auto-traits-error.rs:66:13
|
LL | is_sync(Outer2(TestType));
| ------- ^^^^^^^^^^^^^^^^ expected an implementor of trait `Sync`
| ------- ^^^^^^^^^^^^^^^^ `main::TestType` cannot be sent between threads safely
| |
| required by a bound introduced by this call
|
= note: the trait bound `main::TestType: Sync` is not satisfied
= help: the trait `Send` is not implemented for `main::TestType`
note: required because of the requirements on the impl of `Sync` for `Outer2<main::TestType>`
--> $DIR/negated-auto-traits-error.rs:14:22
|
@ -119,12 +119,6 @@ note: required by a bound in `is_sync`
|
LL | fn is_sync<T: Sync>(_: T) {}
| ^^^^ required by this bound in `is_sync`
help: consider borrowing here
|
LL | is_sync(&Outer2(TestType));
| +
LL | is_sync(&mut Outer2(TestType));
| ++++
error: aborting due to 7 previous errors

11
src/test/ui/typeck/issue-90804-incorrect-reference-suggestion.rs Normal file
View file

@ -0,0 +1,11 @@
// Do not suggest referencing the parameter to `check`
trait Marker<T> {}
impl<T> Marker<i32> for T {}
pub fn check<T: Marker<u32>>(_: T) {}
pub fn main() {
check::<()>(()); //~ ERROR [E0277]
}

17
src/test/ui/typeck/issue-90804-incorrect-reference-suggestion.stderr Normal file
View file

@ -0,0 +1,17 @@
error[E0277]: the trait bound `(): Marker<u32>` is not satisfied
--> $DIR/issue-90804-incorrect-reference-suggestion.rs:10:17
|
LL | check::<()>(());
| ----------- ^^ the trait `Marker<u32>` is not implemented for `()`
| |
| required by a bound introduced by this call
|
note: required by a bound in `check`
--> $DIR/issue-90804-incorrect-reference-suggestion.rs:7:17
|
LL | pub fn check<T: Marker<u32>>(_: T) {}
| ^^^^^^^^^^^ required by this bound in `check`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0277`.