Skip to content

Commit 05f7fef

Browse files
committed
'generic parameters' -> 'generic arguments'
1 parent cb06d5a commit 05f7fef

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

include/swift/AST/DiagnosticsSema.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7798,7 +7798,7 @@ NOTE(result_builder_infer_pick_specific, none,
77987798
"apply result builder %0 (inferred from %select{protocol|dynamic replacement of}1 %2)",
77997799
(Type, unsigned, DeclName))
78007800
ERROR(result_builder_generic_inference_failed, none,
7801-
"unable to infer generic parameters for result builder %0", (DeclAttribute))
7801+
"unable to infer generic arguments for result builder %0", (DeclAttribute))
78027802
GROUPED_WARNING(result_builder_missing_limited_availability,
78037803
ResultBuilderMethods, none,
78047804
"result builder %0 does not implement 'buildLimitedAvailability'; "

include/swift/AST/TypeCheckRequests.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4163,8 +4163,8 @@ enum class CustomAttrTypeKind {
41634163
/// have any particularly interesting semantics.
41644164
GlobalActor,
41654165

4166-
/// Result builder types can have their generics parameters inferred
4167-
/// from the attached declaration.
4166+
/// Result builder types can have their generics arguments
4167+
/// inferred from the attached declaration.
41684168
ResultBuilder,
41694169
};
41704170

test/Constraints/result_builder_diags.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ func testInferResultBuilderGenerics() {
11191119
print(makeArray())
11201120
}
11211121

1122-
@SimpleArrayBuilder // expected-error{{unable to infer generic parameters for result builder @SimpleArrayBuilder}}
1122+
@SimpleArrayBuilder // expected-error{{unable to infer generic arguments for result builder @SimpleArrayBuilder}}
11231123
var string: String {
11241124
"foo"
11251125
}
@@ -1167,7 +1167,7 @@ func testInferResultBuilderGenerics() {
11671167
}
11681168
}
11691169

1170-
@TooManyArgsBuilder // expected-error {{unable to infer generic parameters for result builder @TooManyArgsBuilder}}
1170+
@TooManyArgsBuilder // expected-error {{unable to infer generic arguments for result builder @TooManyArgsBuilder}}
11711171
var invalidTupleArray: [(String, Int)] {
11721172
("foo", 1) // expected-warning {{expression of type '(String, Int)' is unused}}
11731173
("bar", 2) // expected-warning {{expression of type '(String, Int)' is unused}}
@@ -1235,7 +1235,7 @@ func testInferResultBuilderGenerics() {
12351235
"d"
12361236
}
12371237

1238-
@CollectionBuilder // expected-error {{unable to infer generic parameters for result builder @CollectionBuilder}}
1238+
@CollectionBuilder // expected-error {{unable to infer generic arguments for result builder @CollectionBuilder}}
12391239
var contiguousArray: ContiguousArray<String> {
12401240
"c" // expected-warning {{string literal is unused}}
12411241
"d" // expected-warning {{string literal is unused}}
@@ -1255,7 +1255,7 @@ extension Array {
12551255
self = build3()
12561256
}
12571257

1258-
init(@SimpleArrayBuilder build3: () -> ContiguousArray<Element>) { // expected-error {{unable to infer generic parameters for result builder @SimpleArrayBuilder}}
1258+
init(@SimpleArrayBuilder build3: () -> ContiguousArray<Element>) { // expected-error {{unable to infer generic arguments for result builder @SimpleArrayBuilder}}
12591259
self = Array(build3())
12601260
}
12611261
}
@@ -1269,7 +1269,7 @@ extension Set {
12691269
self = Set(build2())
12701270
}
12711271

1272-
init(@SimpleArrayBuilder build3: () -> Self) { // expected-error {{unable to infer generic parameters for result builder @SimpleArrayBuilder}}
1272+
init(@SimpleArrayBuilder build3: () -> Self) { // expected-error {{unable to infer generic arguments for result builder @SimpleArrayBuilder}}
12731273
self = build3()
12741274
}
12751275
}
@@ -1299,7 +1299,7 @@ func testNonGenericResultBuildersInGenericTypeExtensions() {
12991299
"bar"
13001300
}
13011301

1302-
@Array.Builder // expected-error {{unable to infer generic parameters for result builder @Array.Builder}}
1302+
@Array.Builder // expected-error {{unable to infer generic arguments for result builder @Array.Builder}}
13031303
var set: Set<String> {
13041304
"foo" // expected-warning {{string literal is unused}}
13051305
"bar" // expected-warning {{string literal is unused}}
@@ -1311,7 +1311,7 @@ func testNonGenericResultBuildersInGenericTypeExtensions() {
13111311
("baaz", "quux")
13121312
}
13131313

1314-
@Dictionary.Builder // expected-error {{unable to infer generic parameters for result builder @Dictionary.Builder}}
1314+
@Dictionary.Builder // expected-error {{unable to infer generic arguments for result builder @Dictionary.Builder}}
13151315
var dictionary2: [(String, String)] {
13161316
("foo", "bar") // expected-warning {{expression of type '(String, String)' is unused}}
13171317
("baaz", "quux") // expected-warning {{expression of type '(String, String)' is unused}}

test/decl/var/result_builders.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ struct GenericContainer<T> {
7272
struct Maker {} // expected-error {{result builder must provide at least one static 'buildBlock' method}}
7373
}
7474

75-
func makeParamUnbound(@GenericMaker // expected-error {{unable to infer generic parameters for result builder @GenericMaker}}
75+
func makeParamUnbound(@GenericMaker // expected-error {{unable to infer generic arguments for result builder @GenericMaker}}
7676
fn: () -> ()) {}
7777

7878
func makeParamBound(@GenericMaker<Int>
7979
fn: () -> ()) {}
8080

81-
func makeParamNestedUnbound(@GenericContainer.Maker // expected-error {{unable to infer generic parameters for result builder @GenericContainer.Maker}}
81+
func makeParamNestedUnbound(@GenericContainer.Maker // expected-error {{unable to infer generic arguments for result builder @GenericContainer.Maker}}
8282
fn: () -> ()) {}
8383

8484
func makeParamNestedBound(@GenericContainer<Int>.Maker

0 commit comments

Comments
 (0)