about summary refs log tree commit diff
path: root/library/core
diff options
context:
space:
mode:
authorDeadbeef <ent3rm4n@gmail.com>2024-06-26 16:36:42 +0000
committerDeadbeef <ent3rm4n@gmail.com>2024-06-28 15:44:20 +0000
commit65a0bee0b77bad05c1bf29bd2dd855e554a9eaf5 (patch)
treeb3ef6f32a2b9602222ab6a4b6b2d967267b17d3d /library/core
parent8b2fac9612e3840f9736bed31502b3b91ba01a08 (diff)
downloadrust-65a0bee0b77bad05c1bf29bd2dd855e554a9eaf5.tar.gz
rust-65a0bee0b77bad05c1bf29bd2dd855e554a9eaf5.zip
address review comments
Diffstat (limited to 'library/core')
-rw-r--r--library/core/src/marker.rs11
1 files changed, 8 insertions, 3 deletions
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
index 042acbf20b1..9f5818f675d 100644
--- a/library/core/src/marker.rs
+++ b/library/core/src/marker.rs
@@ -1062,9 +1062,14 @@ pub mod effects {
     impl<T: ?Sized> TyCompat<T> for Maybe {}
     impl<T: ?Sized> TyCompat<Maybe> for T {}
 
-    #[lang = "EffectsMin"]
-    pub trait Min {
-        #[lang = "EffectsMinOutput"]
+    #[lang = "EffectsIntersection"]
+    pub trait Intersection {
+        #[lang = "EffectsIntersectionOutput"]
         type Output: ?Sized;
     }
+
+    // FIXME(effects): remove this after next trait solver lands
+    impl Intersection for () {
+        type Output = Maybe;
+    }
 }