Skip to content

Commit 2ccb946

Browse files
authored
Standardise some naming (#2063)
Motivation: In v2 we've predominantly used 'max' instead of 'maximum' and 'config' instead of 'configuration'. We should apply these consistently. Modifications: - Replaces occurrences of 'maximum' with 'max', and 'configuration' with 'config'. Result: More consistent naming
1 parent e359ec7 commit 2ccb946

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Sources/GRPCProtobufCodeGen/ProtobufCodeGenParser.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ internal struct ProtobufCodeGenParser {
2727
let namer: SwiftProtobufNamer
2828
let extraModuleImports: [String]
2929
let protoToModuleMappings: ProtoFileToModuleMappings
30-
let accessLevel: SourceGenerator.Configuration.AccessLevel
30+
let accessLevel: SourceGenerator.Config.AccessLevel
3131

3232
internal init(
3333
input: FileDescriptor,
3434
protoFileModuleMappings: ProtoFileToModuleMappings,
3535
extraModuleImports: [String],
36-
accessLevel: SourceGenerator.Configuration.AccessLevel
36+
accessLevel: SourceGenerator.Config.AccessLevel
3737
) {
3838
self.input = input
3939
self.extraModuleImports = extraModuleImports

Sources/GRPCProtobufCodeGen/ProtobufCodeGenerator.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ public import GRPCCodeGen
1818
public import SwiftProtobufPluginLibrary
1919

2020
public struct ProtobufCodeGenerator {
21-
internal var configuration: SourceGenerator.Configuration
21+
internal var configuration: SourceGenerator.Config
2222

2323
public init(
24-
configuration: SourceGenerator.Configuration
24+
configuration: SourceGenerator.Config
2525
) {
2626
self.configuration = configuration
2727
}
@@ -37,7 +37,7 @@ public struct ProtobufCodeGenerator {
3737
extraModuleImports: extraModuleImports,
3838
accessLevel: self.configuration.accessLevel
3939
)
40-
let sourceGenerator = SourceGenerator(configuration: self.configuration)
40+
let sourceGenerator = SourceGenerator(config: self.configuration)
4141

4242
let codeGenerationRequest = try parser.parse()
4343
let sourceFile = try sourceGenerator.generate(codeGenerationRequest)

Sources/protoc-gen-grpc-swift/GenerateGRPC.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ final class GenerateGRPC: CodeGenerator {
123123
fileNamingOption: options.fileNaming
124124
)
125125

126-
let config = SourceGenerator.Configuration(options: options)
126+
let config = SourceGenerator.Config(options: options)
127127
let fileGenerator = ProtobufCodeGenerator(configuration: config)
128128
let contents = try fileGenerator.generateCode(
129129
from: descriptor,
@@ -212,9 +212,9 @@ private func splitPath(pathname: String) -> (dir: String, base: String, suffix:
212212
}
213213

214214
#if compiler(>=6.0)
215-
extension SourceGenerator.Configuration {
215+
extension SourceGenerator.Config {
216216
init(options: GeneratorOptions) {
217-
let accessLevel: SourceGenerator.Configuration.AccessLevel
217+
let accessLevel: SourceGenerator.Config.AccessLevel
218218
switch options.visibility {
219219
case .internal:
220220
accessLevel = .internal

Tests/GRPCProtobufCodeGenTests/ProtobufCodeGeneratorTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,15 +532,15 @@ final class ProtobufCodeGeneratorTests: XCTestCase {
532532
func testCodeGeneration(
533533
proto: Google_Protobuf_FileDescriptorProto,
534534
indentation: Int,
535-
visibility: SourceGenerator.Configuration.AccessLevel,
535+
visibility: SourceGenerator.Config.AccessLevel,
536536
client: Bool,
537537
server: Bool,
538538
accessLevelOnImports: Bool = true,
539539
expectedCode: String,
540540
file: StaticString = #filePath,
541541
line: UInt = #line
542542
) throws {
543-
let config = SourceGenerator.Configuration(
543+
let config = SourceGenerator.Config(
544544
accessLevel: visibility,
545545
accessLevelOnImports: accessLevelOnImports,
546546
client: client,

0 commit comments

Comments
 (0)