[PATCH] D66783: [clang-doc] Use llvm::createStringError and canonicalize error messages

[Fangrui Song via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL370155: [clang-doc] Use llvm::createStringError and 
canonicalize error messages (authored by MaskRay, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D66783/new/

https://reviews.llvm.org/D66783

Files:
  clang-tools-extra/trunk/clang-doc/BitcodeReader.cpp
  clang-tools-extra/trunk/clang-doc/Generators.cpp
  clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp
  clang-tools-extra/trunk/clang-doc/MDGenerator.cpp
  clang-tools-extra/trunk/clang-doc/Representation.cpp
  clang-tools-extra/trunk/clang-doc/YAMLGenerator.cpp
  clang-tools-extra/trunk/clang-doc/tool/ClangDocMain.cpp

Index: clang-tools-extra/trunk/clang-doc/tool/ClangDocMain.cpp
===
--- clang-tools-extra/trunk/clang-doc/tool/ClangDocMain.cpp
+++ clang-tools-extra/trunk/clang-doc/tool/ClangDocMain.cpp
@@ -172,8 +172,8 @@
   llvm::sys::path::native(Root, Path);
   llvm::sys::path::append(Path, RelativePath);
   if (CreateDirectory(Path))
-return llvm::make_error("Unable to create directory.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "failed to create directory");
   llvm::sys::path::append(Path, Name + Ext);
   return Path;
 }
Index: clang-tools-extra/trunk/clang-doc/BitcodeReader.cpp
===
--- clang-tools-extra/trunk/clang-doc/BitcodeReader.cpp
+++ clang-tools-extra/trunk/clang-doc/BitcodeReader.cpp
@@ -25,8 +25,8 @@
 
 llvm::Error decodeRecord(Record R, SymbolID , llvm::StringRef Blob) {
   if (R[0] != BitCodeConstants::USRHashSize)
-return llvm::make_error("Incorrect USR size.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "incorrect USR size");
 
   // First position in the record is the length of the following array, so we
   // copy the following elements to the field.
@@ -42,8 +42,8 @@
 
 llvm::Error decodeRecord(Record R, int , llvm::StringRef Blob) {
   if (R[0] > INT_MAX)
-return llvm::make_error("Integer too large to parse.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "integer too large to parse");
   Field = (int)R[0];
   return llvm::Error::success();
 }
@@ -58,8 +58,8 @@
 Field = (AccessSpecifier)R[0];
 return llvm::Error::success();
   default:
-return llvm::make_error(
-"Invalid value for AccessSpecifier.\n", llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "invalid value for AccessSpecifier");
   }
 }
 
@@ -73,16 +73,16 @@
 Field = (TagTypeKind)R[0];
 return llvm::Error::success();
   default:
-return llvm::make_error(
-"Invalid value for TagTypeKind.\n", llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "invalid value for TagTypeKind");
   }
 }
 
 llvm::Error decodeRecord(Record R, llvm::Optional ,
  llvm::StringRef Blob) {
   if (R[0] > INT_MAX)
-return llvm::make_error("Integer too large to parse.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "integer too large to parse");
   Field.emplace((int)R[0], Blob, (bool)R[1]);
   return llvm::Error::success();
 }
@@ -97,8 +97,8 @@
 Field = IT;
 return llvm::Error::success();
   }
-  return llvm::make_error("Invalid value for InfoType.\n",
- llvm::inconvertibleErrorCode());
+  return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "invalid value for InfoType");
 }
 
 llvm::Error decodeRecord(Record R, FieldId , llvm::StringRef Blob) {
@@ -113,8 +113,8 @@
 Field = F;
 return llvm::Error::success();
   }
-  return llvm::make_error("Invalid value for FieldId.\n",
- llvm::inconvertibleErrorCode());
+  return llvm::createStringError(llvm::inconvertibleErrorCode(),
+ "invalid value for FieldId");
 }
 
 llvm::Error decodeRecord(Record R,
@@ -127,8 +127,8 @@
 llvm::Error decodeRecord(Record R, llvm::SmallVectorImpl ,
  llvm::StringRef Blob) {
   if (R[0] > INT_MAX)
-return llvm::make_error("Integer too large to parse.\n",
- 

[PATCH] D66783: [clang-doc] Use llvm::createStringError and canonicalize error messages

[Julie Hockett via Phabricator via cfe-commits]

juliehockett accepted this revision.
juliehockett added a comment.
This revision is now accepted and ready to land.

LGTM -- thank you!


Repository:
  rCTE Clang Tools Extra

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D66783/new/

https://reviews.llvm.org/D66783



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D66783: [clang-doc] Use llvm::createStringError and canonicalize error messages

[Fangrui Song via Phabricator via cfe-commits]

MaskRay updated this revision to Diff 217310.
MaskRay added a comment.
Herald added subscribers: kadircet, arphaman.

Fix a few other places


Repository:
  rCTE Clang Tools Extra

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D66783/new/

https://reviews.llvm.org/D66783

Files:
  clang-doc/BitcodeReader.cpp
  clang-doc/Generators.cpp
  clang-doc/HTMLGenerator.cpp
  clang-doc/MDGenerator.cpp
  clang-doc/Representation.cpp
  clang-doc/YAMLGenerator.cpp
  clang-doc/tool/ClangDocMain.cpp

Index: clang-doc/tool/ClangDocMain.cpp
===
--- clang-doc/tool/ClangDocMain.cpp
+++ clang-doc/tool/ClangDocMain.cpp
@@ -172,8 +172,8 @@
   llvm::sys::path::native(Root, Path);
   llvm::sys::path::append(Path, RelativePath);
   if (CreateDirectory(Path))
-return llvm::make_error("Unable to create directory.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "failed to create directory");
   llvm::sys::path::append(Path, Name + Ext);
   return Path;
 }
Index: clang-doc/YAMLGenerator.cpp
===
--- clang-doc/YAMLGenerator.cpp
+++ clang-doc/YAMLGenerator.cpp
@@ -289,8 +289,8 @@
 InfoYAML << *static_cast(I);
 break;
   case InfoType::IT_default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "unexpected InfoType");
   }
   return llvm::Error::success();
 }
Index: clang-doc/Representation.cpp
===
--- clang-doc/Representation.cpp
+++ clang-doc/Representation.cpp
@@ -34,8 +34,8 @@
 llvm::Expected>
 reduce(std::vector> ) {
   if (Values.empty())
-return llvm::make_error(" No values to reduce.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "no value to reduce");
   std::unique_ptr Merged = std::make_unique(Values[0]->USR);
   T *Tmp = static_cast(Merged.get());
   for (auto  : Values)
@@ -96,8 +96,8 @@
 llvm::Expected>
 mergeInfos(std::vector> ) {
   if (Values.empty())
-return llvm::make_error("No info values to merge.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "no info values to merge");
 
   switch (Values[0]->IT) {
   case InfoType::IT_namespace:
@@ -109,8 +109,8 @@
   case InfoType::IT_function:
 return reduce(Values);
   default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "unexpected info type");
   }
 }
 
Index: clang-doc/MDGenerator.cpp
===
--- clang-doc/MDGenerator.cpp
+++ clang-doc/MDGenerator.cpp
@@ -272,8 +272,8 @@
 genMarkdown(*static_cast(I), OS);
 break;
   case InfoType::IT_default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return createStringError(llvm::inconvertibleErrorCode(),
+ "unexpected InfoType");
   }
   return llvm::Error::success();
 }
Index: clang-doc/HTMLGenerator.cpp
===
--- clang-doc/HTMLGenerator.cpp
+++ clang-doc/HTMLGenerator.cpp
@@ -856,8 +856,8 @@
 genHTML(*static_cast(I), CDCtx, "");
 break;
   case InfoType::IT_default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "unexpected info type");
   }
 
   HTMLFile F =
@@ -891,9 +891,9 @@
   llvm::sys::path::append(FilePath, "index_json.js");
   llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::F_None);
   if (FileErr != OK) {
-return llvm::make_error(
-"Error creating index file: " + FileErr.message() + "\n",
-llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "error creating index file: " +
+   FileErr.message());
   }
   CDCtx.Idx.sort();
   llvm::json::OStream J(OS, 2);
@@ -940,9 +940,9 @@
   llvm::sys::path::append(IndexPath, "index.html");
   llvm::raw_fd_ostream IndexOS(IndexPath, FileErr, llvm::sys::fs::F_None);
   if 

[PATCH] D66783: [clang-doc] Use llvm::createStringError and canonicalize error messages

[Fangrui Song via Phabricator via cfe-commits]

MaskRay created this revision.
MaskRay added reviewers: DiegoAstiazaran, juliehockett, jakehehrlich.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
MaskRay updated this revision to Diff 217310.
MaskRay added a comment.
Herald added subscribers: kadircet, arphaman.

Fix a few other places


"Bad block found.\n" -> "bad block found"

The lower cased form with no full stop or newline is more common in LLVM
tools.


Repository:
  rCTE Clang Tools Extra

https://reviews.llvm.org/D66783

Files:
  clang-doc/BitcodeReader.cpp
  clang-doc/Generators.cpp
  clang-doc/HTMLGenerator.cpp
  clang-doc/MDGenerator.cpp
  clang-doc/Representation.cpp
  clang-doc/YAMLGenerator.cpp
  clang-doc/tool/ClangDocMain.cpp

Index: clang-doc/tool/ClangDocMain.cpp
===
--- clang-doc/tool/ClangDocMain.cpp
+++ clang-doc/tool/ClangDocMain.cpp
@@ -172,8 +172,8 @@
   llvm::sys::path::native(Root, Path);
   llvm::sys::path::append(Path, RelativePath);
   if (CreateDirectory(Path))
-return llvm::make_error("Unable to create directory.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "failed to create directory");
   llvm::sys::path::append(Path, Name + Ext);
   return Path;
 }
Index: clang-doc/YAMLGenerator.cpp
===
--- clang-doc/YAMLGenerator.cpp
+++ clang-doc/YAMLGenerator.cpp
@@ -289,8 +289,8 @@
 InfoYAML << *static_cast(I);
 break;
   case InfoType::IT_default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "unexpected InfoType");
   }
   return llvm::Error::success();
 }
Index: clang-doc/Representation.cpp
===
--- clang-doc/Representation.cpp
+++ clang-doc/Representation.cpp
@@ -34,8 +34,8 @@
 llvm::Expected>
 reduce(std::vector> ) {
   if (Values.empty())
-return llvm::make_error(" No values to reduce.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "no value to reduce");
   std::unique_ptr Merged = std::make_unique(Values[0]->USR);
   T *Tmp = static_cast(Merged.get());
   for (auto  : Values)
@@ -96,8 +96,8 @@
 llvm::Expected>
 mergeInfos(std::vector> ) {
   if (Values.empty())
-return llvm::make_error("No info values to merge.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "no info values to merge");
 
   switch (Values[0]->IT) {
   case InfoType::IT_namespace:
@@ -109,8 +109,8 @@
   case InfoType::IT_function:
 return reduce(Values);
   default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "unexpected info type");
   }
 }
 
Index: clang-doc/MDGenerator.cpp
===
--- clang-doc/MDGenerator.cpp
+++ clang-doc/MDGenerator.cpp
@@ -272,8 +272,8 @@
 genMarkdown(*static_cast(I), OS);
 break;
   case InfoType::IT_default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return createStringError(llvm::inconvertibleErrorCode(),
+ "unexpected InfoType");
   }
   return llvm::Error::success();
 }
Index: clang-doc/HTMLGenerator.cpp
===
--- clang-doc/HTMLGenerator.cpp
+++ clang-doc/HTMLGenerator.cpp
@@ -856,8 +856,8 @@
 genHTML(*static_cast(I), CDCtx, "");
 break;
   case InfoType::IT_default:
-return llvm::make_error("Unexpected info type.\n",
-   llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "unexpected info type");
   }
 
   HTMLFile F =
@@ -891,9 +891,9 @@
   llvm::sys::path::append(FilePath, "index_json.js");
   llvm::raw_fd_ostream OS(FilePath, FileErr, llvm::sys::fs::F_None);
   if (FileErr != OK) {
-return llvm::make_error(
-"Error creating index file: " + FileErr.message() + "\n",
-llvm::inconvertibleErrorCode());
+return llvm::createStringError(llvm::inconvertibleErrorCode(),
+   "error creating index file: " +
+