Make module selectors non-experimental

Approved by SE-0491.

Author: beccadax

include/swift/Basic/Features.def

@@ -276,6 +276,7 @@ LANGUAGE_FEATURE(InlineArrayTypeSugar, 483, "Type sugar for InlineArray")
 LANGUAGE_FEATURE(LifetimeDependenceMutableAccessors, 0, "Support mutable accessors returning ~Escapable results")
 LANGUAGE_FEATURE(InoutLifetimeDependence, 0, "Support @_lifetime(&)")
 SUPPRESSIBLE_LANGUAGE_FEATURE(NonexhaustiveAttribute, 487, "Nonexhaustive Enums")
+LANGUAGE_FEATURE(ModuleSelector, 491, "Module selectors (`Module::name` syntax)")
 
 // Swift 6
 UPCOMING_FEATURE(ConciseMagicFile, 274, 6)
@@ -533,9 +534,6 @@ EXPERIMENTAL_FEATURE(AllowRuntimeSymbolDeclarations, true)
 /// Allow use of `@c`
 EXPERIMENTAL_FEATURE(CDecl, false)
 
-/// Allow use of `Module::name` syntax
-EXPERIMENTAL_FEATURE(ModuleSelector, false)
-
 /// Allow use of `using` declaration that control default isolation
 /// in a file scope.
 EXPERIMENTAL_FEATURE(DefaultIsolationPerFile, false)

lib/Parse/Lexer.cpp

@@ -2768,7 +2768,7 @@ void Lexer::lexImpl() {
   case '\\': return formToken(tok::backslash, TokStart);
 
   case ':':
-    if (CurPtr[0] == ':' && LangOpts.hasFeature(Feature::ModuleSelector)) {
+    if (CurPtr[0] == ':') {
       CurPtr++;
       return formToken(tok::colon_colon, TokStart);
     }
@@ -2882,7 +2882,6 @@ Token Lexer::getTokenAtLocation(const SourceManager &SM, SourceLoc Loc,
   // Use fake language options; language options only affect validity
   // and the exact token produced.
   LangOptions FakeLangOpts;
-  FakeLangOpts.enableFeature(Feature::ModuleSelector);
 
   // Here we return comments as tokens because either the caller skipped
   // comments and normally we won't be at the beginning of a comment token

lib/Parse/ParseDecl.cpp

@@ -4259,8 +4259,7 @@ ParserStatus Parser::parseDeclAttribute(DeclAttributes &Attributes,
         .warnUntilSwiftVersion(6);
   }
 
-  bool hasModuleSelector = Context.LangOpts.hasFeature(Feature::ModuleSelector)
-                              && peekToken().is(tok::colon_colon);
+  bool hasModuleSelector = peekToken().is(tok::colon_colon);
 
   // If this not an identifier, the attribute is malformed.
   if (Tok.isNot(tok::identifier) &&

lib/Parse/ParseExpr.cpp

@@ -2284,9 +2284,6 @@ unsigned Parser::isAtModuleSelector() {
 }
 
 std::optional<Located<Identifier>> Parser::parseModuleSelector() {
-  if (!Context.LangOpts.hasFeature(Feature::ModuleSelector))
-    return std::nullopt;
-
   if (!isAtModuleSelector())
     return std::nullopt;
 

test/NameLookup/module_selector.swift

@@ -1,7 +1,7 @@
-// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-builtin-module -enable-experimental-feature ModuleSelector
-// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-builtin-module -enable-experimental-feature ModuleSelector -enable-experimental-feature ParserASTGen
+// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-builtin-module
+// RUN: %target-typecheck-verify-swift -verify-ignore-unrelated -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-builtin-module -enable-experimental-feature ParserASTGen
 
-// REQUIRES: swift_feature_ModuleSelector, swift_feature_ParserASTGen
+// REQUIRES: swift_feature_ParserASTGen
 
 // FIXME: This test doesn't really cover:
 //

test/NameLookup/module_selector_cross_import.swift

@@ -1,7 +1,7 @@
-// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-experimental-feature ModuleSelector -enable-cross-import-overlays
-// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-experimental-feature ModuleSelector -enable-experimental-feature ParserASTGen -enable-cross-import-overlays
+// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-cross-import-overlays
+// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-experimental-feature ParserASTGen -enable-cross-import-overlays
 
-// REQUIRES: swift_feature_ModuleSelector, swift_feature_ParserASTGen
+// REQUIRES: swift_feature_ParserASTGen
 
 import ModuleSelectorTestingKit
 import ctypes

test/Parse/module_selector.swift

@@ -1,10 +1,10 @@
-// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-experimental-feature ModuleSelector -parse -verify-additional-prefix legacy-
-// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -enable-experimental-feature ModuleSelector -parse -verify-additional-prefix new- -enable-experimental-feature ParserASTGen
+// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -parse -verify-additional-prefix legacy-
+// RUN: %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs -parse -verify-additional-prefix new- -enable-experimental-feature ParserASTGen
 
 // Make sure the lack of the experimental flag disables the feature:
 // RUN: not %target-typecheck-verify-swift -sdk %clang-importer-sdk -module-name main -I %S/Inputs 2>/dev/null
 
-// REQUIRES: swift_feature_ModuleSelector, swift_feature_ParserASTGen
+// REQUIRES: swift_feature_ParserASTGen
 
 // ModuleSelectorImports
 import struct ModuleSelectorTestingKit::A

test/expr/primary/unqualified_name.swift

@@ -1,8 +1,5 @@
 // RUN: %target-typecheck-verify-swift -swift-version 4
 
-// RUN: %target-typecheck-verify-swift -swift-version 4 -enable-experimental-feature ModuleSelector
-// REQUIRES: swift_feature_ModuleSelector
-
 func f0(_ x: Int, y: Int, z: Int) { }
 func f1(_ x: Int, while: Int) { }
 func f2(_ x: Int, `let` _: Int) { }