summary refs log tree commit diff
path: root/compiler/rustc_middle/src/traits
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2022-07-15 16:30:07 +0000
committerMichael Goulet <michael@errs.io>2022-07-15 17:21:55 +0000
commit1c8f87e9071a0eca3cb6ccab1ca2cc3d5ea2ad73 (patch)
treec206c2c38bc19d59f25e16861c042e3f82a4e475 /compiler/rustc_middle/src/traits
parent0fe5390a885eb47f506bf481cd9ea2b449705d79 (diff)
downloadrust-1c8f87e9071a0eca3cb6ccab1ca2cc3d5ea2ad73.tar.gz
rust-1c8f87e9071a0eca3cb6ccab1ca2cc3d5ea2ad73.zip
Revert "Highlight conflicting param-env candidates"
This reverts commit 08135254dcf22be0d5661ea8f75e703b29a83514.
Diffstat (limited to 'compiler/rustc_middle/src/traits')
-rw-r--r--compiler/rustc_middle/src/traits/mod.rs10
1 files changed, 1 insertions, 9 deletions
diff --git a/compiler/rustc_middle/src/traits/mod.rs b/compiler/rustc_middle/src/traits/mod.rs
index d8cc7d3feb0..3e4e56888ff 100644
--- a/compiler/rustc_middle/src/traits/mod.rs
+++ b/compiler/rustc_middle/src/traits/mod.rs
@@ -541,17 +541,9 @@ pub enum SelectionError<'tcx> {
     ErrorReporting,
     /// Multiple applicable `impl`s where found. The `DefId`s correspond to
     /// all the `impl`s' Items.
-    Ambiguous(Vec<AmbiguousSelection>),
+    Ambiguous(Vec<DefId>),
 }
 
-#[derive(Copy, Clone, Debug)]
-pub enum AmbiguousSelection {
-    Impl(DefId),
-    ParamEnv(Span),
-}
-
-TrivialTypeTraversalAndLiftImpls! { AmbiguousSelection, }
-
 /// When performing resolution, it is typically the case that there
 /// can be one of three outcomes:
 ///