]> granicus.if.org Git - clang/commitdiff
Remove error message when using the fallback style.
authorManuel Klimek <klimek@google.com>
Tue, 2 Jun 2015 11:52:15 +0000 (11:52 +0000)
committerManuel Klimek <klimek@google.com>
Tue, 2 Jun 2015 11:52:15 +0000 (11:52 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@238822 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Format/Format.cpp
test/Format/style-on-command-line.cpp

index 10c68f9da617474c9481dfb498550f7412fad098..c725b4bf30ab2428efcc9ee652ec0d31c25238ba 100644 (file)
@@ -1640,8 +1640,6 @@ FormatStyle getStyle(StringRef StyleName, StringRef FileName,
       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) << ": "
index 007022e74461ca0b040c4fc9b831609c917453f9..69c54b2b63f3e182e5eb36f3d7bd135bc1942b45 100644 (file)
@@ -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;$}}