Merge remote-tracking branch 'origin/master' into master-rebranch

dan-zheng · Aug 11, 2020 · 3f190e6 · 3f190e6
2 parents f0dedaf + 92efa8b
commit 3f190e6
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 197 deletions.
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -2818,7 +2818,8 @@ NOTE(codable_extraneous_codingkey_case_here,none,
 NOTE(codable_non_conforming_property_here,none,
      "cannot automatically synthesize %0 because %1 does not conform to %0", (Type, TypeLoc))
 NOTE(codable_non_decoded_property_here,none,
-     "cannot automatically synthesize %0 because %1 does not have a matching CodingKey and does not have a default value", (Type, Identifier))
+     "cannot automatically synthesize %0 because %1 does not have a matching "
+     "CodingKey and does not have a default value", (Type, Identifier))
 NOTE(codable_codingkeys_type_is_not_an_enum_here,none,
      "cannot automatically synthesize %0 because 'CodingKeys' is not an enum", (Type))
 NOTE(codable_codingkeys_type_does_not_conform_here,none,