No longer require file attribute in HHVM for modules

jamesjwu · facebook-github-bot · commit cb398e7bb06e · 2022-10-19T11:54:24.000-07:00
Summary:
We'll still require it in the typechecker and still gate the same way via a whitelist for the time being, but this unblocks us from adding modules into systemlib without the ugly file attribute.

Unrelated test timeout:

Reviewed By: oulgen

Differential Revision: D40441753

fbshipit-source-id: 497a13d27308b54b62de65807f0ead5aa71024af
diff --git a/hphp/hack/src/parser/rust_parser_errors.rs b/hphp/hack/src/parser/rust_parser_errors.rs
@@ -114,7 +114,7 @@ impl UnstableFeatures {
             UnstableFeatures::ExpressionTrees => Unstable,
             UnstableFeatures::Ifc => Unstable,
             UnstableFeatures::Readonly => Preview,
-            UnstableFeatures::Modules => Preview,
+            UnstableFeatures::Modules => OngoingRelease,
             UnstableFeatures::ModuleReferences => Unstable,
             UnstableFeatures::ContextAliasDeclaration => Unstable,
             UnstableFeatures::ContextAliasDeclarationShort => Preview,
diff --git a/hphp/test/slow/debugger/modules.php.inc b/hphp/test/slow/debugger/modules.php.inc
@@ -1,3 +1,3 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 new module foo {}
diff --git a/hphp/test/slow/debugger/modules.php.inc2 b/hphp/test/slow/debugger/modules.php.inc2
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 
 internal class Foo {
diff --git a/hphp/test/slow/enum_class/enum_class_internal.inc b/hphp/test/slow/enum_class/enum_class_internal.inc
@@ -1,3 +1,3 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 new module foo {}
diff --git a/hphp/test/slow/enum_class/enum_class_internal.php b/hphp/test/slow/enum_class/enum_class_internal.php
@@ -1,6 +1,6 @@
 <?hh
 // Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 internal enum class E : mixed {
   int A = 42;
diff --git a/hphp/test/slow/modules/autoload-1.inc b/hphp/test/slow/modules/autoload-1.inc
@@ -1,5 +1,5 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 new module a {}
diff --git a/hphp/test/slow/modules/basic-1.inc b/hphp/test/slow/modules/basic-1.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module B;
 
diff --git a/hphp/test/slow/modules/basic-2.inc b/hphp/test/slow/modules/basic-2.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/basic-3.inc b/hphp/test/slow/modules/basic-3.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module B;
 
diff --git a/hphp/test/slow/modules/basic-3.php b/hphp/test/slow/modules/basic-3.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/basic-4.inc b/hphp/test/slow/modules/basic-4.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module B;
 
diff --git a/hphp/test/slow/modules/basic-4.php b/hphp/test/slow/modules/basic-4.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/basic-soft-1.php b/hphp/test/slow/modules/basic-soft-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/basic-throw-1.php b/hphp/test/slow/modules/basic-throw-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/basic-throw-4.php b/hphp/test/slow/modules/basic-throw-4.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/duplicate-module-1.inc b/hphp/test/slow/modules/duplicate-module-1.inc
@@ -1,5 +1,5 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 new module A {}
diff --git a/hphp/test/slow/modules/duplicate-module-1.php b/hphp/test/slow/modules/duplicate-module-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 new module A {}
 
diff --git a/hphp/test/slow/modules/instance-properties-incdec-throw.php b/hphp/test/slow/modules/instance-properties-incdec-throw.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties-incdec.php b/hphp/test/slow/modules/instance-properties-incdec.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties-throw-2.php b/hphp/test/slow/modules/instance-properties-throw-2.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties-throw-3.php b/hphp/test/slow/modules/instance-properties-throw-3.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties-throw.php b/hphp/test/slow/modules/instance-properties-throw.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties.inc b/hphp/test/slow/modules/instance-properties.inc
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 
 class Foo {
diff --git a/hphp/test/slow/modules/instance-properties.php b/hphp/test/slow/modules/instance-properties.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties2.php b/hphp/test/slow/modules/instance-properties2.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/instance-properties3.php b/hphp/test/slow/modules/instance-properties3.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/method-cache-1.inc b/hphp/test/slow/modules/method-cache-1.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module B;
 
diff --git a/hphp/test/slow/modules/method-cache-1.php b/hphp/test/slow/modules/method-cache-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 module A;
 
diff --git a/hphp/test/slow/modules/module-attribute-1.php b/hphp/test/slow/modules/module-attribute-1.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 class Ok implements HH\ModuleAttribute {
   public function foo(): string {
diff --git a/hphp/test/slow/modules/module.inc b/hphp/test/slow/modules/module.inc
@@ -1,3 +1,3 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 new module foo {}
diff --git a/hphp/test/slow/modules/module_newtype.php b/hphp/test/slow/modules/module_newtype.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 module newtype Foo = FooInternal; // ok
 internal class FooInternal {
diff --git a/hphp/test/slow/modules/module_newtype_module.inc b/hphp/test/slow/modules/module_newtype_module.inc
@@ -1,3 +1,3 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 new module foo {}
diff --git a/hphp/test/slow/modules/module_newtype_outside_module.inc b/hphp/test/slow/modules/module_newtype_outside_module.inc
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 function outside_module(Foo $x) : void {
   $x->foo(); // ok
 }
diff --git a/hphp/test/slow/modules/module_newtype_separate_file.inc b/hphp/test/slow/modules/module_newtype_separate_file.inc
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 function separate_file(Foo $x) : void {
   $x->foo(); // ok
diff --git a/hphp/test/slow/modules/public_toplevel.inc b/hphp/test/slow/modules/public_toplevel.inc
@@ -1,3 +1,3 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 new module foo {}
diff --git a/hphp/test/slow/modules/public_toplevel.php b/hphp/test/slow/modules/public_toplevel.php
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 
 public class Foo {}
diff --git a/hphp/test/slow/modules/reflection-2.inc b/hphp/test/slow/modules/reflection-2.inc
@@ -1,5 +1,5 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 new module B {}
diff --git a/hphp/test/slow/modules/reflection-2.php b/hphp/test/slow/modules/reflection-2.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 
 <<Ok, Yes>>
 new module A {}
diff --git a/hphp/test/slow/modules/reflection-3.php b/hphp/test/slow/modules/reflection-3.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module A;
 
 internal function f() {}
diff --git a/hphp/test/slow/modules/resolve-1.inc b/hphp/test/slow/modules/resolve-1.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module b;
 
 function bar1() { return foo<>; }
diff --git a/hphp/test/slow/modules/resolve-1.inc1 b/hphp/test/slow/modules/resolve-1.inc1
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module a;
 
 internal function foo() { echo "in f\n"; }
diff --git a/hphp/test/slow/modules/resolve-1.php b/hphp/test/slow/modules/resolve-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module b;
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/resolve-2.inc b/hphp/test/slow/modules/resolve-2.inc
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module a;
 
 function bar1() { return foo<>; }
diff --git a/hphp/test/slow/modules/resolve-2.php b/hphp/test/slow/modules/resolve-2.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module b;
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/resolve-throw-1.php b/hphp/test/slow/modules/resolve-throw-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module b;
 
 function pp_exn(Exception $e) {
diff --git a/hphp/test/slow/modules/resolve-throw-2.php b/hphp/test/slow/modules/resolve-throw-2.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module b;
 
 function pp_exn(Exception $e) {
diff --git a/hphp/test/slow/modules/static-inheritance-1.inc1 b/hphp/test/slow/modules/static-inheritance-1.inc1
@@ -1,5 +1,5 @@
 <?hh
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 
 internal class Child extends Foo {
diff --git a/hphp/test/slow/modules/static-inheritance-1.php b/hphp/test/slow/modules/static-inheritance-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 
 <<__EntryPoint>>
diff --git a/hphp/test/slow/modules/static-inheritance-throw-1.php b/hphp/test/slow/modules/static-inheritance-throw-1.php
@@ -1,6 +1,6 @@
 <?hh
 
-<<file:__EnableUnstableFeatures("modules")>>
+
 module foo;
 
 <<__EntryPoint>>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<?hh`
`2`		`-<<file:__EnableUnstableFeatures("modules")>>`
	`2`	`+`
`3`	`3`	`function outside_module(Foo $x) : void {`
`4`	`4`	`$x->foo(); // ok`
`5`	`5`	`}`