r238822 - Remove error message when using the fallback style.

Manuel Klimek klimek at google.com
Tue Jun 2 04:52:15 PDT 2015


Author: klimek
Date: Tue Jun  2 06:52:15 2015
New Revision: 238822

URL: http://llvm.org/viewvc/llvm-project?rev=238822&view=rev
Log:
Remove error message when using the fallback style.

Modified:
    cfe/trunk/lib/Format/Format.cpp
    cfe/trunk/test/Format/style-on-command-line.cpp

Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=238822&r1=238821&r2=238822&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Tue Jun  2 06:52:15 2015
@@ -1640,8 +1640,6 @@ FormatStyle getStyle(StringRef StyleName
       return Style;
     }
   }
-  llvm::errs() << "Can't find usable .clang-format, using " << FallbackStyle
-               << " style\n";
   if (!UnsuitableConfigFiles.empty()) {
     llvm::errs() << "Configuration file(s) do(es) not support "
                  << getLanguageName(Style.Language) << ": "

Modified: cfe/trunk/test/Format/style-on-command-line.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Format/style-on-command-line.cpp?rev=238822&r1=238821&r2=238822&view=diff
==============================================================================
--- cfe/trunk/test/Format/style-on-command-line.cpp (original)
+++ cfe/trunk/test/Format/style-on-command-line.cpp Tue Jun  2 06:52:15 2015
@@ -24,7 +24,6 @@ void f() {
 // CHECK4: {{^  int \*i;$}}
 // CHECK5: {{^     int\* i;$}}
 // CHECK6: {{^Error reading .*\.clang-format: (I|i)nvalid argument}}
-// CHECK6: {{^Can't find usable .clang-format, using webkit style$}}
 // CHECK6: {{^    int\* i;$}}
 // CHECK7: {{^      int\* i;$}}
 // CHECK8: {{^  int\* i;$}}





More information about the cfe-commits mailing list