about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDeadbeef <ent3rm4n@gmail.com>2023-06-30 15:50:58 +0000
committerDeadbeef <ent3rm4n@gmail.com>2023-07-04 11:47:46 +0000
commit30b21b758a57da86509bb1ebf7a2fe57a98110fa (patch)
treec3634a29e6cbfc87a5539ba9f812956d5b0c2bdb
parent0b095a60d27921a3af0e9f1ac0d1d15b75dad0ef (diff)
downloadrust-30b21b758a57da86509bb1ebf7a2fe57a98110fa.tar.gz
rust-30b21b758a57da86509bb1ebf7a2fe57a98110fa.zip
add test
-rw-r--r--compiler/rustc_hir_analysis/src/collect/generics_of.rs8
-rw-r--r--tests/ui/rfcs/rfc-2632-const-trait-impl/effects/helloworld.rs29
2 files changed, 35 insertions, 2 deletions
diff --git a/compiler/rustc_hir_analysis/src/collect/generics_of.rs b/compiler/rustc_hir_analysis/src/collect/generics_of.rs
index 2206f640529..db446715596 100644
--- a/compiler/rustc_hir_analysis/src/collect/generics_of.rs
+++ b/compiler/rustc_hir_analysis/src/collect/generics_of.rs
@@ -9,7 +9,7 @@ use rustc_hir::def_id::LocalDefId;
 use rustc_middle::ty::{self, TyCtxt};
 use rustc_session::lint;
 use rustc_span::symbol::{kw, Symbol};
-use rustc_span::Span;
+use rustc_span::{sym, Span};
 
 pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
     use rustc_hir::*;
@@ -295,7 +295,11 @@ pub(super) fn generics_of(tcx: TyCtxt<'_>, def_id: LocalDefId) -> ty::Generics {
             })
         }
         GenericParamKind::Const { default, .. } => {
-            if !matches!(allow_defaults, Defaults::Allowed) && default.is_some() {
+            // `rustc_host` effect params are allowed to have defaults.
+            if !matches!(allow_defaults, Defaults::Allowed)
+                && default.is_some()
+                && !tcx.has_attr(param.def_id, sym::rustc_host)
+            {
                 tcx.sess.span_err(
                     param.span,
                     "defaults for const parameters are only allowed in \
diff --git a/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/helloworld.rs b/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/helloworld.rs
new file mode 100644
index 00000000000..49457354cc9
--- /dev/null
+++ b/tests/ui/rfcs/rfc-2632-const-trait-impl/effects/helloworld.rs
@@ -0,0 +1,29 @@
+// check-pass
+
+// gate-test-effects
+// ^ effects doesn't have a gate so we will trick tidy into thinking this is a gate test
+
+#![feature(const_trait_impl, effects, rustc_attrs)]
+
+// ensure we are passing in the correct host effect in always const contexts.
+
+pub const fn hmm</* T, */ #[rustc_host] const host: bool = true>() -> usize {
+    if host {
+        1
+    } else {
+        0
+    }
+}
+
+const _: () = {
+    let x = hmm();
+    assert!(0 == x);
+};
+
+/* FIXME(effects)
+pub const fn uwu(x: [u8; hmm::<()>()]) {
+    let [] = x;
+}
+*/
+
+fn main() {}