Skip to content

Rename some public APIs regarding serialization/parsing. #276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allevato merged 7 commits into from
Feb 17, 2017
Merged

Rename some public APIs regarding serialization/parsing. #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ddc0586
Rename some public serialization/parsing APIs on Message.
allevato Feb 16, 2017
9def299
Regenerate tests.
allevato Feb 16, 2017
cb5f64a
More source changes.
allevato Feb 16, 2017
0d9985f
Update reference protos.
allevato Feb 16, 2017
475ad55
Merge branch 'master' into the-first-renaming
allevato Feb 17, 2017
e8f9be6
Add "unknownFields" to reserved word lists for types and fields.
allevato Feb 17, 2017
0cc33f8
Regenerate reference protos again.
allevato Feb 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Reference/google/protobuf/compiler/plugin.pb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct Google_Protobuf_Compiler_Version: SwiftProtobuf.Message, SwiftProtobuf.Pr
4: .same(proto: "suffix"),
]

var unknown = SwiftProtobuf.UnknownStorage()
var unknownFields = SwiftProtobuf.UnknownStorage()

private var _major: Int32? = nil
var major: Int32 {
Expand Down Expand Up @@ -157,15 +157,15 @@ struct Google_Protobuf_Compiler_Version: SwiftProtobuf.Message, SwiftProtobuf.Pr
if let v = _suffix {
try visitor.visitSingularField(fieldType: SwiftProtobuf.ProtobufString.self, value: v, fieldNumber: 4)
}
unknown.traverse(visitor: visitor)
unknownFields.traverse(visitor: visitor)
}

func _protoc_generated_isEqualTo(other: Google_Protobuf_Compiler_Version) -> Bool {
if _major != other._major {return false}
if _minor != other._minor {return false}
if _patch != other._patch {return false}
if _suffix != other._suffix {return false}
if unknown != other.unknown {return false}
if unknownFields != other.unknownFields {return false}
return true
}
}
Expand All @@ -183,7 +183,7 @@ struct Google_Protobuf_Compiler_CodeGeneratorRequest: SwiftProtobuf.Message, Swi

private class _StorageClass {
typealias ExtendedMessage = Google_Protobuf_Compiler_CodeGeneratorRequest
var unknown = SwiftProtobuf.UnknownStorage()
var unknownFields = SwiftProtobuf.UnknownStorage()
var _fileToGenerate: [String] = []
var _parameter: String? = nil
var _protoFile: [Google_Protobuf_FileDescriptorProto] = []
Expand Down Expand Up @@ -223,21 +223,21 @@ struct Google_Protobuf_Compiler_CodeGeneratorRequest: SwiftProtobuf.Message, Swi
if !_protoFile.isEmpty {
try visitor.visitRepeatedMessageField(value: _protoFile, fieldNumber: 15)
}
unknown.traverse(visitor: visitor)
unknownFields.traverse(visitor: visitor)
}

func isEqualTo(other: _StorageClass) -> Bool {
if _fileToGenerate != other._fileToGenerate {return false}
if _parameter != other._parameter {return false}
if _protoFile != other._protoFile {return false}
if _compilerVersion != other._compilerVersion {return false}
if unknown != other.unknown {return false}
if unknownFields != other.unknownFields {return false}
return true
}

func copy() -> _StorageClass {
let clone = _StorageClass()
clone.unknown = unknown
clone.unknownFields = unknownFields
clone._fileToGenerate = _fileToGenerate
clone._parameter = _parameter
clone._protoFile = _protoFile
Expand All @@ -248,9 +248,9 @@ struct Google_Protobuf_Compiler_CodeGeneratorRequest: SwiftProtobuf.Message, Swi

private var _storage = _StorageClass()

var unknown: SwiftProtobuf.UnknownStorage {
get {return _storage.unknown}
set {_storage.unknown = newValue}
var unknownFields: SwiftProtobuf.UnknownStorage {
get {return _storage.unknownFields}
set {_storage.unknownFields = newValue}
}

/// The .proto files that were explicitly listed on the command-line. The
Expand Down Expand Up @@ -338,7 +338,7 @@ struct Google_Protobuf_Compiler_CodeGeneratorResponse: SwiftProtobuf.Message, Sw
15: .same(proto: "file"),
]

var unknown = SwiftProtobuf.UnknownStorage()
var unknownFields = SwiftProtobuf.UnknownStorage()

/// Represents a single generated file.
struct File: SwiftProtobuf.Message, SwiftProtobuf.Proto2Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf.ProtoNameProviding {
Expand All @@ -350,7 +350,7 @@ struct Google_Protobuf_Compiler_CodeGeneratorResponse: SwiftProtobuf.Message, Sw
15: .same(proto: "content"),
]

var unknown = SwiftProtobuf.UnknownStorage()
var unknownFields = SwiftProtobuf.UnknownStorage()

/// The file name, relative to the output directory. The name must not
/// contain "." or ".." components and must be relative, not be absolute (so,
Expand Down Expand Up @@ -462,14 +462,14 @@ struct Google_Protobuf_Compiler_CodeGeneratorResponse: SwiftProtobuf.Message, Sw
if let v = _content {
try visitor.visitSingularField(fieldType: SwiftProtobuf.ProtobufString.self, value: v, fieldNumber: 15)
}
unknown.traverse(visitor: visitor)
unknownFields.traverse(visitor: visitor)
}

func _protoc_generated_isEqualTo(other: Google_Protobuf_Compiler_CodeGeneratorResponse.File) -> Bool {
if _name != other._name {return false}
if _insertionPoint != other._insertionPoint {return false}
if _content != other._content {return false}
if unknown != other.unknown {return false}
if unknownFields != other.unknownFields {return false}
return true
}
}
Expand Down Expand Up @@ -517,13 +517,13 @@ struct Google_Protobuf_Compiler_CodeGeneratorResponse: SwiftProtobuf.Message, Sw
if !file.isEmpty {
try visitor.visitRepeatedMessageField(value: file, fieldNumber: 15)
}
unknown.traverse(visitor: visitor)
unknownFields.traverse(visitor: visitor)
}

func _protoc_generated_isEqualTo(other: Google_Protobuf_Compiler_CodeGeneratorResponse) -> Bool {
if _error != other._error {return false}
if file != other.file {return false}
if unknown != other.unknown {return false}
if unknownFields != other.unknownFields {return false}
return true
}
}
Loading