浏览代码

[Support] Rename unconvertibleErrorCode to inconvertibleErrorCode.

Based on a totally scientific, 30 second google search "in-" appears to be the
preferred prefix.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@270950 91177308-0d34-0410-b5e6-96231b3b80d8
Lang Hames 9 年之前
父节点
当前提交
c93d4ea0e3
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 1 1
      include/llvm/Support/Error.h
  2. 6 6
      lib/Support/Error.cpp
  3. 1 1
      unittests/Support/ErrorTest.cpp

+ 1 - 1
include/llvm/Support/Error.h

@@ -857,7 +857,7 @@ protected:
 /// sensible conversion to std::error_code is available, as attempts to convert
 /// to/from this error will result in a fatal error. (i.e. it is a programmatic
 ///error to try to convert such a value).
-std::error_code unconvertibleErrorCode();
+std::error_code inconvertibleErrorCode();
 
 /// Helper for converting an std::error_code to a Error.
 Error errorCodeToError(std::error_code EC);

+ 6 - 6
lib/Support/Error.cpp

@@ -20,7 +20,7 @@ namespace {
 
   enum class ErrorErrorCode : int {
     MultipleErrors = 1,
-    UnconvertibleError
+    InconvertibleError
   };
 
   // FIXME: This class is only here to support the transition to llvm::Error. It
@@ -34,8 +34,8 @@ namespace {
       switch (static_cast<ErrorErrorCode>(condition)) {
       case ErrorErrorCode::MultipleErrors:
         return "Multiple errors";
-      case ErrorErrorCode::UnconvertibleError:
-        return "Unconvertible error value. An error has occurred that could "
+      case ErrorErrorCode::InconvertibleError:
+        return "Inconvertible error value. An error has occurred that could "
                "not be converted to a known std::error_code. Please file a "
                "bug.";
       }
@@ -61,8 +61,8 @@ std::error_code ErrorList::convertToErrorCode() const {
                          *ErrorErrorCat);
 }
 
-std::error_code unconvertibleErrorCode() {
-  return std::error_code(static_cast<int>(ErrorErrorCode::UnconvertibleError),
+std::error_code inconvertibleErrorCode() {
+  return std::error_code(static_cast<int>(ErrorErrorCode::InconvertibleError),
                          *ErrorErrorCat);
 }
 
@@ -77,7 +77,7 @@ std::error_code errorToErrorCode(Error Err) {
   handleAllErrors(std::move(Err), [&](const ErrorInfoBase &EI) {
     EC = EI.convertToErrorCode();
   });
-  if (EC == unconvertibleErrorCode())
+  if (EC == inconvertibleErrorCode())
     report_fatal_error(EC.message());
   return EC;
 }

+ 1 - 1
unittests/Support/ErrorTest.cpp

@@ -382,7 +382,7 @@ TEST(Error, StringError) {
   std::string Msg;
   raw_string_ostream S(Msg);
   logAllUnhandledErrors(make_error<StringError>("foo" + Twine(42),
-                                                unconvertibleErrorCode()),
+                                                inconvertibleErrorCode()),
                         S, "");
   EXPECT_EQ(S.str(), "foo42\n") << "Unexpected StringError log result";