diff --git a/hphp/hack/src/parser/rust_parser_errors.rs b/hphp/hack/src/parser/rust_parser_errors.rs index 37bb67e525f9e..1868592e63c5a 100644 --- 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 index 69e791fe738ab..cbf2f69efa278 100644 --- a/hphp/test/slow/debugger/modules.php.inc +++ b/hphp/test/slow/debugger/modules.php.inc @@ -1,3 +1,3 @@ > + new module foo {} diff --git a/hphp/test/slow/debugger/modules.php.inc2 b/hphp/test/slow/debugger/modules.php.inc2 index 91d016fe15889..77cf6d498a5d2 100644 --- a/hphp/test/slow/debugger/modules.php.inc2 +++ b/hphp/test/slow/debugger/modules.php.inc2 @@ -1,5 +1,5 @@ > + 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 index 69e791fe738ab..cbf2f69efa278 100644 --- a/hphp/test/slow/enum_class/enum_class_internal.inc +++ b/hphp/test/slow/enum_class/enum_class_internal.inc @@ -1,3 +1,3 @@ > + 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 index 5c985a95fd6a7..0d7d9932ab180 100644 --- a/hphp/test/slow/enum_class/enum_class_internal.php +++ b/hphp/test/slow/enum_class/enum_class_internal.php @@ -1,6 +1,6 @@ > + 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 index 29a40f85e2415..f725aab73a059 100644 --- a/hphp/test/slow/modules/autoload-1.inc +++ b/hphp/test/slow/modules/autoload-1.inc @@ -1,5 +1,5 @@ > + new module a {} diff --git a/hphp/test/slow/modules/basic-1.inc b/hphp/test/slow/modules/basic-1.inc index 0a2636babd518..a5aac450b2db6 100644 --- a/hphp/test/slow/modules/basic-1.inc +++ b/hphp/test/slow/modules/basic-1.inc @@ -1,6 +1,6 @@ > + module B; diff --git a/hphp/test/slow/modules/basic-2.inc b/hphp/test/slow/modules/basic-2.inc index 62a0a608ed782..ccc487d96040b 100644 --- a/hphp/test/slow/modules/basic-2.inc +++ b/hphp/test/slow/modules/basic-2.inc @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/basic-3.inc b/hphp/test/slow/modules/basic-3.inc index 1ea49153b3a71..fec7205e633fb 100644 --- a/hphp/test/slow/modules/basic-3.inc +++ b/hphp/test/slow/modules/basic-3.inc @@ -1,6 +1,6 @@ > + module B; diff --git a/hphp/test/slow/modules/basic-3.php b/hphp/test/slow/modules/basic-3.php index d0f10f221a181..856dcc9e61a24 100644 --- a/hphp/test/slow/modules/basic-3.php +++ b/hphp/test/slow/modules/basic-3.php @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/basic-4.inc b/hphp/test/slow/modules/basic-4.inc index 878c742ca3bc6..04d938666da2b 100644 --- a/hphp/test/slow/modules/basic-4.inc +++ b/hphp/test/slow/modules/basic-4.inc @@ -1,6 +1,6 @@ > + module B; diff --git a/hphp/test/slow/modules/basic-4.php b/hphp/test/slow/modules/basic-4.php index 1320cd3073b2d..0a83fb06a0448 100644 --- a/hphp/test/slow/modules/basic-4.php +++ b/hphp/test/slow/modules/basic-4.php @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/basic-soft-1.php b/hphp/test/slow/modules/basic-soft-1.php index 8f8d492bcaef7..027713efb791c 100644 --- a/hphp/test/slow/modules/basic-soft-1.php +++ b/hphp/test/slow/modules/basic-soft-1.php @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/basic-throw-1.php b/hphp/test/slow/modules/basic-throw-1.php index e9bd85faa138a..000cb762f0c8f 100644 --- a/hphp/test/slow/modules/basic-throw-1.php +++ b/hphp/test/slow/modules/basic-throw-1.php @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/basic-throw-4.php b/hphp/test/slow/modules/basic-throw-4.php index 74189992fbbdb..6e506f3f3e7f2 100644 --- a/hphp/test/slow/modules/basic-throw-4.php +++ b/hphp/test/slow/modules/basic-throw-4.php @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/duplicate-module-1.inc b/hphp/test/slow/modules/duplicate-module-1.inc index 781c260da0735..9d1fa314aca61 100644 --- a/hphp/test/slow/modules/duplicate-module-1.inc +++ b/hphp/test/slow/modules/duplicate-module-1.inc @@ -1,5 +1,5 @@ > + new module A {} diff --git a/hphp/test/slow/modules/duplicate-module-1.php b/hphp/test/slow/modules/duplicate-module-1.php index 8f8dee58e87b4..0bcebb58c2286 100644 --- a/hphp/test/slow/modules/duplicate-module-1.php +++ b/hphp/test/slow/modules/duplicate-module-1.php @@ -1,6 +1,6 @@ > + 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 index 3e049d750e5f6..377e5b71683ac 100644 --- a/hphp/test/slow/modules/instance-properties-incdec-throw.php +++ b/hphp/test/slow/modules/instance-properties-incdec-throw.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties-incdec.php b/hphp/test/slow/modules/instance-properties-incdec.php index c01172dfaf813..9d96b3d20fdb8 100644 --- a/hphp/test/slow/modules/instance-properties-incdec.php +++ b/hphp/test/slow/modules/instance-properties-incdec.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties-throw-2.php b/hphp/test/slow/modules/instance-properties-throw-2.php index 1e7edb34b5209..dd8c408cf39f9 100644 --- a/hphp/test/slow/modules/instance-properties-throw-2.php +++ b/hphp/test/slow/modules/instance-properties-throw-2.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties-throw-3.php b/hphp/test/slow/modules/instance-properties-throw-3.php index 2441d113b3879..472d1ea8ee9ce 100644 --- a/hphp/test/slow/modules/instance-properties-throw-3.php +++ b/hphp/test/slow/modules/instance-properties-throw-3.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties-throw.php b/hphp/test/slow/modules/instance-properties-throw.php index cc5106f26ca34..8916673d5d9e5 100644 --- a/hphp/test/slow/modules/instance-properties-throw.php +++ b/hphp/test/slow/modules/instance-properties-throw.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties.inc b/hphp/test/slow/modules/instance-properties.inc index 87d8348ac4f69..6aa641274d9cc 100644 --- a/hphp/test/slow/modules/instance-properties.inc +++ b/hphp/test/slow/modules/instance-properties.inc @@ -1,5 +1,5 @@ > + module foo; class Foo { diff --git a/hphp/test/slow/modules/instance-properties.php b/hphp/test/slow/modules/instance-properties.php index b09abfde65313..703d4d8bb380f 100644 --- a/hphp/test/slow/modules/instance-properties.php +++ b/hphp/test/slow/modules/instance-properties.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties2.php b/hphp/test/slow/modules/instance-properties2.php index 22c42578c0303..406040d4a315d 100644 --- a/hphp/test/slow/modules/instance-properties2.php +++ b/hphp/test/slow/modules/instance-properties2.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/instance-properties3.php b/hphp/test/slow/modules/instance-properties3.php index 1a85e2220975d..e6a72177b7988 100644 --- a/hphp/test/slow/modules/instance-properties3.php +++ b/hphp/test/slow/modules/instance-properties3.php @@ -1,5 +1,5 @@ > + <<__EntryPoint>> diff --git a/hphp/test/slow/modules/method-cache-1.inc b/hphp/test/slow/modules/method-cache-1.inc index f4d5f4724fa9c..5ffb2dc13d2dd 100644 --- a/hphp/test/slow/modules/method-cache-1.inc +++ b/hphp/test/slow/modules/method-cache-1.inc @@ -1,6 +1,6 @@ > + module B; diff --git a/hphp/test/slow/modules/method-cache-1.php b/hphp/test/slow/modules/method-cache-1.php index c86b4301b60cc..97d64bc9651d7 100644 --- a/hphp/test/slow/modules/method-cache-1.php +++ b/hphp/test/slow/modules/method-cache-1.php @@ -1,6 +1,6 @@ > + module A; diff --git a/hphp/test/slow/modules/module-attribute-1.php b/hphp/test/slow/modules/module-attribute-1.php index c5ab994ed4d9d..3fb4979d965bb 100644 --- a/hphp/test/slow/modules/module-attribute-1.php +++ b/hphp/test/slow/modules/module-attribute-1.php @@ -1,5 +1,5 @@ > + 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 index 69e791fe738ab..cbf2f69efa278 100644 --- a/hphp/test/slow/modules/module.inc +++ b/hphp/test/slow/modules/module.inc @@ -1,3 +1,3 @@ > + new module foo {} diff --git a/hphp/test/slow/modules/module_newtype.php b/hphp/test/slow/modules/module_newtype.php index 7981e4960c8fc..56aa8224a0259 100644 --- a/hphp/test/slow/modules/module_newtype.php +++ b/hphp/test/slow/modules/module_newtype.php @@ -1,5 +1,5 @@ > + 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 index 69e791fe738ab..cbf2f69efa278 100644 --- a/hphp/test/slow/modules/module_newtype_module.inc +++ b/hphp/test/slow/modules/module_newtype_module.inc @@ -1,3 +1,3 @@ > + 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 index 5cc8185ce6e98..8799f45a11449 100644 --- a/hphp/test/slow/modules/module_newtype_outside_module.inc +++ b/hphp/test/slow/modules/module_newtype_outside_module.inc @@ -1,5 +1,5 @@ > + 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 index 0d27f69d4a496..d1ba8d29f8a7f 100644 --- a/hphp/test/slow/modules/module_newtype_separate_file.inc +++ b/hphp/test/slow/modules/module_newtype_separate_file.inc @@ -1,5 +1,5 @@ > + 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 index 69e791fe738ab..cbf2f69efa278 100644 --- a/hphp/test/slow/modules/public_toplevel.inc +++ b/hphp/test/slow/modules/public_toplevel.inc @@ -1,3 +1,3 @@ > + new module foo {} diff --git a/hphp/test/slow/modules/public_toplevel.php b/hphp/test/slow/modules/public_toplevel.php index 27003cb95ccf9..244fa4884144a 100644 --- a/hphp/test/slow/modules/public_toplevel.php +++ b/hphp/test/slow/modules/public_toplevel.php @@ -1,5 +1,5 @@ > + module foo; public class Foo {} diff --git a/hphp/test/slow/modules/reflection-2.inc b/hphp/test/slow/modules/reflection-2.inc index ad1fcd27ed2ec..f881a596bc8b2 100644 --- a/hphp/test/slow/modules/reflection-2.inc +++ b/hphp/test/slow/modules/reflection-2.inc @@ -1,5 +1,5 @@ > + new module B {} diff --git a/hphp/test/slow/modules/reflection-2.php b/hphp/test/slow/modules/reflection-2.php index ffeed7bd780f2..31055ffd57ebb 100644 --- a/hphp/test/slow/modules/reflection-2.php +++ b/hphp/test/slow/modules/reflection-2.php @@ -1,6 +1,6 @@ > + <> new module A {} diff --git a/hphp/test/slow/modules/reflection-3.php b/hphp/test/slow/modules/reflection-3.php index 4a9f93b5d3042..beaaf8ac949e5 100644 --- a/hphp/test/slow/modules/reflection-3.php +++ b/hphp/test/slow/modules/reflection-3.php @@ -1,6 +1,6 @@ > + module A; internal function f() {} diff --git a/hphp/test/slow/modules/resolve-1.inc b/hphp/test/slow/modules/resolve-1.inc index b211b5570b339..376f90c297a7d 100644 --- a/hphp/test/slow/modules/resolve-1.inc +++ b/hphp/test/slow/modules/resolve-1.inc @@ -1,6 +1,6 @@ > + module b; function bar1() { return foo<>; } diff --git a/hphp/test/slow/modules/resolve-1.inc1 b/hphp/test/slow/modules/resolve-1.inc1 index ff8dd5cfd5561..639a3a243e296 100644 --- a/hphp/test/slow/modules/resolve-1.inc1 +++ b/hphp/test/slow/modules/resolve-1.inc1 @@ -1,6 +1,6 @@ > + 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 index fea12d3c85cbe..8ebaa64389ceb 100644 --- a/hphp/test/slow/modules/resolve-1.php +++ b/hphp/test/slow/modules/resolve-1.php @@ -1,6 +1,6 @@ > + module b; <<__EntryPoint>> diff --git a/hphp/test/slow/modules/resolve-2.inc b/hphp/test/slow/modules/resolve-2.inc index e160d37bc769e..2e1565a635cc5 100644 --- a/hphp/test/slow/modules/resolve-2.inc +++ b/hphp/test/slow/modules/resolve-2.inc @@ -1,6 +1,6 @@ > + module a; function bar1() { return foo<>; } diff --git a/hphp/test/slow/modules/resolve-2.php b/hphp/test/slow/modules/resolve-2.php index f4a793cc0e825..ec6faad82c994 100644 --- a/hphp/test/slow/modules/resolve-2.php +++ b/hphp/test/slow/modules/resolve-2.php @@ -1,6 +1,6 @@ > + module b; <<__EntryPoint>> diff --git a/hphp/test/slow/modules/resolve-throw-1.php b/hphp/test/slow/modules/resolve-throw-1.php index 76a0404352385..059491f30b237 100644 --- a/hphp/test/slow/modules/resolve-throw-1.php +++ b/hphp/test/slow/modules/resolve-throw-1.php @@ -1,6 +1,6 @@ > + 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 index 59672b577d61a..258bd5bc2e95c 100644 --- a/hphp/test/slow/modules/resolve-throw-2.php +++ b/hphp/test/slow/modules/resolve-throw-2.php @@ -1,6 +1,6 @@ > + 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 index 9a91d77adfb3f..c1402099417ff 100644 --- a/hphp/test/slow/modules/static-inheritance-1.inc1 +++ b/hphp/test/slow/modules/static-inheritance-1.inc1 @@ -1,5 +1,5 @@ > + 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 index 3f7cf629caf11..2818d8081eb43 100644 --- a/hphp/test/slow/modules/static-inheritance-1.php +++ b/hphp/test/slow/modules/static-inheritance-1.php @@ -1,6 +1,6 @@ > + 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 index daf9c6351249f..8e40cf3d413bb 100644 --- a/hphp/test/slow/modules/static-inheritance-throw-1.php +++ b/hphp/test/slow/modules/static-inheritance-throw-1.php @@ -1,6 +1,6 @@ > + module foo; <<__EntryPoint>>