Skip to content

Commit b73118c

Browse files
authored
Merge pull request #2336 from ahoppen/ahoppen/codegen-509-for-real
Make CodeGeneration depend on swift-syntax 509
2 parents 0747547 + c7f3b83 commit b73118c

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

CodeGeneration/Package.swift

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,8 @@ let package = Package(
1212
.executable(name: "generate-swift-syntax", targets: ["generate-swift-syntax"])
1313
],
1414
dependencies: [
15-
// This directory is a standalone package that uses swift-syntax from the
16-
// outer directory.
17-
// If you are making significant changs to `CodeGeneration` locally and want
18-
// to avoid breaking the build of `CodeGeneration` itself by generating new
19-
// files in the parent swift-syntax package, it is encouraged to change the
20-
// dependency to the following. That way `CodeGeneration` has its own
21-
// checkout of swift-syntax that is unaffected by the newly generated files.
22-
// Be sure to revert the change before committing your changes.
23-
//
24-
// .package(url: "https://github.com/apple/swift-syntax", branch: "main")
25-
.package(path: "..")
15+
.package(url: "https://github.com/apple/swift-syntax", from: "509.0.0"),
16+
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
2617
],
2718
targets: [
2819
.executableTarget(
@@ -63,14 +54,3 @@ let package = Package(
6354
),
6455
]
6556
)
66-
67-
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
68-
// Building standalone.
69-
package.dependencies += [
70-
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2")
71-
]
72-
} else {
73-
package.dependencies += [
74-
.package(path: "../../swift-argument-parser")
75-
]
76-
}

Sources/SwiftParser/generated/ExperimentalFeatures.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ extension Parser {
2525

2626
extension Parser.ExperimentalFeatures {
2727
/// Whether to enable the parsing of reference bindings.
28-
public static let referenceBindings = Self(rawValue: 1 << 0)
28+
public static let referenceBindings = Self (rawValue: 1 << 0)
2929

3030
/// Whether to enable the parsing of 'then' statements.
31-
public static let thenStatements = Self(rawValue: 1 << 1)
31+
public static let thenStatements = Self (rawValue: 1 << 1)
3232

3333
/// Whether to enable the parsing of typed throws.
34-
public static let typedThrows = Self(rawValue: 1 << 2)
34+
public static let typedThrows = Self (rawValue: 1 << 2)
3535

3636
/// Whether to enable the parsing of 'do' expressions.
37-
public static let doExpressions = Self(rawValue: 1 << 3)
37+
public static let doExpressions = Self (rawValue: 1 << 3)
3838
}

0 commit comments

Comments
 (0)