Switch to the 'Swift' diagnostic style as the default

Author: DougGregor

include/swift/Basic/DiagnosticOptions.h

@@ -70,8 +70,8 @@ class DiagnosticOptions {
   bool PrintEducationalNotes = false;
 
   /// Whether to emit diagnostics in the terse LLVM style or in a more
-  /// descriptive style that's specific to Swift (currently experimental).
-  FormattingStyle PrintedFormattingStyle = FormattingStyle::LLVM;
+  /// descriptive style that's specific to Swift.
+  FormattingStyle PrintedFormattingStyle = FormattingStyle::Swift;
 
   /// Whether to emit macro expansion buffers into separate, temporary files.
   bool EmitMacroExpansionFiles = true;

lib/Frontend/CompilerInvocation.cpp

@@ -1974,7 +1974,7 @@ static bool ParseDiagnosticArgs(DiagnosticOptions &Opts, ArgList &Args,
                    OPT_no_color_diagnostics,
                    /*Default=*/llvm::sys::Process::StandardErrHasColors());
   // If no style options are specified, default to LLVM style.
-  Opts.PrintedFormattingStyle = DiagnosticOptions::FormattingStyle::LLVM;
+  Opts.PrintedFormattingStyle = DiagnosticOptions::FormattingStyle::Swift;
   if (const Arg *arg = Args.getLastArg(OPT_diagnostic_style)) {
     StringRef contents = arg->getValue();
     if (contents == "llvm") {

stdlib/public/CMakeLists.txt

@@ -49,9 +49,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
   list(APPEND SWIFT_RUNTIME_CORE_CXX_FLAGS "-xc++")
 endif()
 
-# Use the new diagnostic formatter.
-list(APPEND SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS "-diagnostic-style" "swift")
-
 # We should avoid non-literals in format strings, or appropriately mark
 # functions.
 check_cxx_compiler_flag("-Wformat-nonliteral -Werror=format-nonliteral" CXX_SUPPORTS_FORMAT_NONLITERAL_WARNING)

stdlib/public/Concurrency/CMakeLists.txt

@@ -170,7 +170,6 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
   SWIFT_COMPILE_FLAGS
     ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
     -parse-stdlib
-    -diagnostic-style swift
     ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS}
   ${swift_concurrency_options}
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"