Create OngoingRelease status for preview features, set diamond trait …

…reuse to ongoingrelase Summary: This diff adds a new OngoingRelease enum in preview features that turns on unstable feature checking in rust_parser_errors for the runtime but not the typechecker. Once you have a feature in this state, the typechecker will still enforce it. After HHVM is released, you can then remove any use of `check_can_use_feature` for your feature. This will turn off typechecker enforcement. After that, be warned that there may still be file attributes left in www from previewing. Feature implementers will need to clean those up in www first before removing their feature from the UnstableFeatures enum altogether. Reviewed By: francesco-zappa-nardelli Differential Revision: D40182173 fbshipit-source-id: cbdeaa9aefde948d78054d461192ac40712bd25d
facebook · Oct 8, 2022 · dcfea5c · dcfea5c
1 parent 7e52b43
commit dcfea5c
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 14 deletions.
diff --git a/hphp/hack/src/parser/rust_parser_errors.rs b/hphp/hack/src/parser/rust_parser_errors.rs
@@ -73,6 +73,7 @@ enum FeatureStatus {
     Preview,
     Migration,
     Deprecated,
+    OngoingRelease,
     // TODO: add other modes like "Advanced" or "Deprecated" if necessary.
     // Those are just variants of "Preview" for the runtime's sake, though,
     // and likely only need to be distinguished in the lint rule rather than here
@@ -121,7 +122,7 @@ impl UnstableFeatures {
             UnstableFeatures::TypeConstSuperBound => Unstable,
             UnstableFeatures::ClassConstDefault => Migration,
             UnstableFeatures::TypeRefinements => Unstable,
-            UnstableFeatures::MethodTraitDiamond => Preview,
+            UnstableFeatures::MethodTraitDiamond => OngoingRelease,
             UnstableFeatures::UpcastExpression => Unstable,
             UnstableFeatures::RequireClass => Preview,
             UnstableFeatures::EnumClassTypeConstants => Unstable,
@@ -1251,7 +1252,12 @@ impl<'a, State: 'a + Clone> ParserErrors<'a, State> {
             }
 
             _ => false,
-        } || self.env.context.active_unstable_features.contains(feature);
+        } || self.env.context.active_unstable_features.contains(feature)
+          // Preview features with an ongoing release should be allowed by the
+          // runtime, but not the typechecker
+          || (feature.get_feature_status() == FeatureStatus::OngoingRelease
+            && self.env.codegen);
+
         if !enabled {
             self.errors.push(make_error_from_node(
                 node,

diff --git a/...iamond_use/diamond_use_no_attribute_2.php → ...rait_reuse/trait_diamond_no_attribute.php b/...iamond_use/diamond_use_no_attribute_2.php → ...rait_reuse/trait_diamond_no_attribute.php
diff --git a/hphp/hack/test/typecheck/trait_reuse/trait_diamond_no_attribute.php.exp b/hphp/hack/test/typecheck/trait_reuse/trait_diamond_no_attribute.php.exp
@@ -0,0 +1,2 @@
+File "trait_diamond_no_attribute.php", line 15, characters 1-30:
+Cannot use unstable feature: `method_trait_diamond` (Parsing[1002])
diff --git a/hphp/test/slow/traits/diamond_use/diamond_trait_with_attribute_good.php b/hphp/test/slow/traits/diamond_use/diamond_trait_with_attribute_good.php
@@ -0,0 +1,20 @@
+<?hh
+<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
+trait MyTrait1 {
+  public function testFun(): void {}
+}
+trait MyTrait2 {
+  use MyTrait1;
+}
+
+<<__EnableMethodTraitDiamond>>
+class MyClass {
+  use MyTrait1;
+  use MyTrait2;
+}
+
+<<__EntryPoint>>
+function foo(): void {
+  echo "Done!\n";
+}
diff --git a/hphp/test/slow/traits/diamond_use/diamond_trait_with_attribute_good.php.expectf b/hphp/test/slow/traits/diamond_use/diamond_trait_with_attribute_good.php.expectf
@@ -0,0 +1 @@
+Done!
diff --git a/hphp/test/slow/traits/diamond_use/diamond_use1.php b/hphp/test/slow/traits/diamond_use/diamond_use1.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use2.php b/hphp/test/slow/traits/diamond_use/diamond_use2.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use3.php b/hphp/test/slow/traits/diamond_use/diamond_use3.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use4.php b/hphp/test/slow/traits/diamond_use/diamond_use4.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use5.php b/hphp/test/slow/traits/diamond_use/diamond_use5.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use6.php b/hphp/test/slow/traits/diamond_use/diamond_use6.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use7.php b/hphp/test/slow/traits/diamond_use/diamond_use7.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use_const.php b/hphp/test/slow/traits/diamond_use/diamond_use_const.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 class C {
   const int X = 1;

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use_final1.php b/hphp/test/slow/traits/diamond_use/diamond_use_final1.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public final function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use_final2.php b/hphp/test/slow/traits/diamond_use/diamond_use_final2.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public final function foo() : void {

diff --git a/hphp/test/slow/traits/diamond_use/diamond_use_no_attribute_2.php.expectf b/hphp/test/slow/traits/diamond_use/diamond_use_no_attribute_2.php.expectf
diff --git a/hphp/test/slow/traits/diamond_use/diamond_use_static1.php b/hphp/test/slow/traits/diamond_use/diamond_use_static1.php
@@ -1,7 +1,7 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
 
-<<file:__EnableUnstableFeatures('method_trait_diamond')>>
+
 
 trait T {
   public static function foo() : void {