-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #105332 - estebank:iterator-chains, r=oli-obk
Point out the type of associated types in every method call of iterator chains Partially address #105184 by pointing out the type of associated types in every method call of iterator chains: ``` note: the expression is of type `Map<std::slice::Iter<'_, {integer}>, [closure@src/test/ui/iterators/invalid-iterator-chain.rs:12:18: 12:21]>` --> src/test/ui/iterators/invalid-iterator-chain.rs:12:14 | 10 | vec![0, 1] | ---------- this expression has type `Vec<{integer}>` 11 | .iter() | ------ associated type `std::iter::Iterator::Item` is `&{integer}` here 12 | .map(|x| { x; }) | ^^^^^^^^^^^^^^^ associated type `std::iter::Iterator::Item` is `()` here ``` We also reduce the number of impls we mention when any of the candidates is an "exact match". This benefits the output of cases with numerics greatly. Outstanding work would be to provide a structured suggestion for appropriate changes, like in this case detecting the spurious `;` in the closure.
- Loading branch information
Showing
33 changed files
with
744 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
compiler/rustc_trait_selection/src/traits/error_reporting/method_chain.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
use crate::infer::InferCtxt; | ||
|
||
use rustc_middle::ty::error::TypeError; | ||
use rustc_middle::ty::relate::{self, Relate, RelateResult, TypeRelation}; | ||
use rustc_middle::ty::{self, Ty, TyCtxt}; | ||
|
||
pub struct CollectAllMismatches<'a, 'tcx> { | ||
pub infcx: &'a InferCtxt<'tcx>, | ||
pub param_env: ty::ParamEnv<'tcx>, | ||
pub errors: Vec<TypeError<'tcx>>, | ||
} | ||
|
||
impl<'a, 'tcx> TypeRelation<'tcx> for CollectAllMismatches<'a, 'tcx> { | ||
fn tag(&self) -> &'static str { | ||
"CollectAllMismatches" | ||
} | ||
fn tcx(&self) -> TyCtxt<'tcx> { | ||
self.infcx.tcx | ||
} | ||
fn intercrate(&self) -> bool { | ||
false | ||
} | ||
fn param_env(&self) -> ty::ParamEnv<'tcx> { | ||
self.param_env | ||
} | ||
fn a_is_expected(&self) -> bool { | ||
true | ||
} // irrelevant | ||
fn mark_ambiguous(&mut self) { | ||
bug!() | ||
} | ||
fn relate_with_variance<T: Relate<'tcx>>( | ||
&mut self, | ||
_: ty::Variance, | ||
_: ty::VarianceDiagInfo<'tcx>, | ||
a: T, | ||
b: T, | ||
) -> RelateResult<'tcx, T> { | ||
self.relate(a, b) | ||
} | ||
fn regions( | ||
&mut self, | ||
a: ty::Region<'tcx>, | ||
_b: ty::Region<'tcx>, | ||
) -> RelateResult<'tcx, ty::Region<'tcx>> { | ||
Ok(a) | ||
} | ||
fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> { | ||
if a == b || matches!(a.kind(), ty::Infer(_)) || matches!(b.kind(), ty::Infer(_)) { | ||
return Ok(a); | ||
} | ||
relate::super_relate_tys(self, a, b).or_else(|e| { | ||
self.errors.push(e); | ||
Ok(a) | ||
}) | ||
} | ||
fn consts( | ||
&mut self, | ||
a: ty::Const<'tcx>, | ||
b: ty::Const<'tcx>, | ||
) -> RelateResult<'tcx, ty::Const<'tcx>> { | ||
if a == b { | ||
return Ok(a); | ||
} | ||
relate::super_relate_consts(self, a, b) // could do something similar here for constants! | ||
} | ||
fn binders<T: Relate<'tcx>>( | ||
&mut self, | ||
a: ty::Binder<'tcx, T>, | ||
b: ty::Binder<'tcx, T>, | ||
) -> RelateResult<'tcx, ty::Binder<'tcx, T>> { | ||
Ok(a.rebind(self.relate(a.skip_binder(), b.skip_binder())?)) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.