diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index b24d491f4fa8a..f399971ff66d5 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -1595,7 +1595,7 @@ ASTContext::takeDelayedConformanceDiags(NormalProtocolConformance *conformance){
 
 size_t ASTContext::getTotalMemory() const {
   size_t Size = sizeof(*this) +
-    //LoadedModules ?
+    // LoadedModules ?
     // ExternalDefinitions ?
     llvm::capacity_in_bytes(CanonicalGenericTypeParamTypeNames) +
     // RemappedTypes ?
diff --git a/lib/Serialization/Deserialization.cpp b/lib/Serialization/Deserialization.cpp
index e186d32d16962..37e80cd204e64 100644
--- a/lib/Serialization/Deserialization.cpp
+++ b/lib/Serialization/Deserialization.cpp
@@ -3643,7 +3643,7 @@ Type ModuleFile::getType(TypeID TID) {
     bool noreturn = false;
     bool throws = false;
 
-    //todo add noreturn serialization.
+    // TODO: add noreturn serialization.
     decls_block::PolymorphicFunctionTypeLayout::readRecord(scratch,
                                                            inputID,
                                                            resultID,
@@ -3679,7 +3679,7 @@ Type ModuleFile::getType(TypeID TID) {
     bool throws = false;
     ArrayRef<uint64_t> genericParamIDs;
 
-    //todo add noreturn serialization.
+    // TODO: add noreturn serialization.
     decls_block::GenericFunctionTypeLayout::readRecord(scratch,
                                                        inputID,
                                                        resultID,
diff --git a/test/Inputs/comment_to_something_conversion.swift b/test/Inputs/comment_to_something_conversion.swift
index ceba26f61bfb9..b2a619b62554e 100644
--- a/test/Inputs/comment_to_something_conversion.swift
+++ b/test/Inputs/comment_to_something_conversion.swift
@@ -94,15 +94,15 @@ enum A012_AttachToEntities {
   func f1() {}
 // CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f1()</Name><USR>s:FC14swift_ide_test5Brief2f1FT_T_</USR><Declaration>func f1()</Declaration><Abstract><Para>Aaa.</Para></Abstract><Discussion><Para>Bbb.</Para></Discussion></Function>]
 
-  ///Aaa.
+  /// Aaa.
   ///
-  ///> Bbb.
+  /// Bbb.
   func f2() {}
 // CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f2()</Name><USR>s:FC14swift_ide_test5Brief2f2FT_T_</USR><Declaration>func f2()</Declaration><Abstract><Para>Aaa.</Para></Abstract><Discussion><Para>Bbb.</Para></Discussion></Function>]
 
-  ///Aaa.
+  /// Aaa.
   ///
-  ///Bbb.
+  /// Bbb.
   func f3() {}
 // CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f3()</Name><USR>s:FC14swift_ide_test5Brief2f3FT_T_</USR><Declaration>func f3()</Declaration><Abstract><Para>Aaa.</Para></Abstract><Discussion><Para>Bbb.</Para></Discussion></Function>]
 }