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

Account for macros when trying to point at inference cause

Browse source 
Do not point at macro invocation which expands to an inference error. Avoid the following:

```
error[E0308]: mismatched types
  --> $DIR/does-not-have-iter-interpolated.rs:12:5
   |
LL |     quote!($($nonrep)*);
   |     ^^^^^^^^^^^^^^^^^^^
   |     |
   |     expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
   |     expected due to this
   |     here the type of `has_iter` is inferred to be `ThereIsNoIteratorInRepetition`
```
This commit is contained in:
Esteban Küber 2025-08-10 21:47:52 +00:00
parent 18eeac04fc
commit e9609abda4
5 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_typeck/src/demand.rs
View file

@ -698,7 +698,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
) {
match (self.tcx.parent_hir_node(expr.hir_id), error) {
(hir::Node::LetStmt(hir::LetStmt { ty: Some(ty), init: Some(init), .. }), _)
if init.hir_id == expr.hir_id =>
if init.hir_id == expr.hir_id && !ty.span.source_equal(init.span) =>
{
// Point at `let` assignment type.
err.span_label(ty.span, "expected due to this");

1
tests/ui/proc-macro/quote/does-not-have-iter-interpolated-dup.stderr
View file

@ -5,7 +5,6 @@ LL | quote!($($nonrep $nonrep)*);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
| |
| expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
| expected due to this
| here the type of `has_iter` is inferred to be `ThereIsNoIteratorInRepetition`
error: aborting due to 1 previous error

1
tests/ui/proc-macro/quote/does-not-have-iter-interpolated.stderr
View file

@ -5,7 +5,6 @@ LL | quote!($($nonrep)*);
| ^^^^^^^^^^^^^^^^^^^
| |
| expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
| expected due to this
| here the type of `has_iter` is inferred to be `ThereIsNoIteratorInRepetition`
error: aborting due to 1 previous error

5
tests/ui/proc-macro/quote/does-not-have-iter-separated.stderr
View file

@ -2,10 +2,7 @@ error[E0308]: mismatched types
--> $DIR/does-not-have-iter-separated.rs:8:5
|
LL | quote!($(a b),*);
| ^^^^^^^^^^^^^^^^
| |
| expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
| expected due to this
| ^^^^^^^^^^^^^^^^ expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
error: aborting due to 1 previous error

5
tests/ui/proc-macro/quote/does-not-have-iter.stderr
View file

@ -2,10 +2,7 @@ error[E0308]: mismatched types
--> $DIR/does-not-have-iter.rs:8:5
|
LL | quote!($(a b)*);
| ^^^^^^^^^^^^^^^
| |
| expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
| expected due to this
| ^^^^^^^^^^^^^^^ expected `HasIterator`, found `ThereIsNoIteratorInRepetition`
error: aborting due to 1 previous error