diff options
| author | bors <bors@rust-lang.org> | 2022-04-26 01:52:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-26 01:52:46 +0000 |
| commit | 9ea4d4127fa2c7e99d31a4a8a59227c9874d61dc (patch) | |
| tree | 13119c42117d0cb1689dda545278f629f45ade06 /compiler/rustc_trait_selection/src | |
| parent | ec8619dca239f57201a3ceb59e93149659c07b58 (diff) | |
| parent | f0b2dccc2161a6d17effb63232b1dce885f5305e (diff) | |
| download | rust-9ea4d4127fa2c7e99d31a4a8a59227c9874d61dc.tar.gz rust-9ea4d4127fa2c7e99d31a4a8a59227c9874d61dc.zip | |
Auto merge of #96414 - Dylan-DPC:rollup-t4ofhoa, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #90312 (Fix some confusing wording and improve slice-search-related docs) - #96149 (Remove unused macro rules) - #96279 (rustdoc: Remove .woff font files) - #96355 (Better handle too many `#` recovery in raw str) - #96379 (delay bug when adjusting `NeverToAny` twice during diagnostic code) - #96384 (do not consider two extern types to be similar) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs b/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs index 50e4fafdd6c..082402a38e3 100644 --- a/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs @@ -1727,6 +1727,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'a, 'tcx> for InferCtxt<'a, 'tcx> { } else if cat_a == cat_b { match (a.kind(), b.kind()) { (ty::Adt(def_a, _), ty::Adt(def_b, _)) => def_a == def_b, + (ty::Foreign(def_a), ty::Foreign(def_b)) => def_a == def_b, // Matching on references results in a lot of unhelpful // suggestions, so let's just not do that for now. // |