averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85833 from swiftlang/jepa-main

Browse Source 
[NFC] "SwiftVersion" → "LanguageMode" in `DiagnosticEngine::warnUntilSwiftVersion`, etc.
This commit is contained in:
Anthony Latsis
2025-12-05 09:34:30 +00:00
committed by GitHub
parent 161d00f803 88220a33c3
commit 153dd02cd8
67 changed files with 402 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Frontend/CompilerInvocation.cpp
View File

@@ -906,8 +906,8 @@ static bool ParseEnabledFeatureArgs(LangOptions &Opts, ArgList &Args,
// If the current language mode enables the feature by default then
// diagnose and skip it.
if (auto firstVersion = feature->getLanguageVersion()) {
if (Opts.isSwiftVersionAtLeast(*firstVersion)) {
if (auto firstVersion = feature->getLanguageMode()) {
if (Opts.isLanguageModeAtLeast(*firstVersion)) {
Diags.diagnose(SourceLoc(),
diag::warning_upcoming_feature_on_by_default,
feature->getName(), *firstVersion);
@@ -1284,8 +1284,8 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
// Add a future feature if it is not already implied by the language version.
auto addFutureFeatureIfNotImplied = [&](Feature feature) {
// Check if this feature was introduced already in this language version.
if (auto firstVersion = feature.getLanguageVersion()) {
if (Opts.isSwiftVersionAtLeast(*firstVersion))
if (auto firstVersion = feature.getLanguageMode()) {
if (Opts.isLanguageModeAtLeast(*firstVersion))
return;
}
@@ -1462,7 +1462,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
if (Args.hasFlag(OPT_enable_nonfrozen_enum_exhaustivity_diagnostics,
OPT_disable_nonfrozen_enum_exhaustivity_diagnostics,
Opts.isSwiftVersionAtLeast(5))) {
Opts.isLanguageModeAtLeast(5))) {
Opts.enableFeature(Feature::NonfrozenEnumExhaustivity);
}
@@ -1878,7 +1878,7 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
A->getAsString(Args), A->getValue());
HadError = true;
}
} else if (Opts.isSwiftVersionAtLeast(6)) {
} else if (Opts.isLanguageModeAtLeast(6)) {
Opts.UseCheckedAsyncObjCBridging = true;
}