diff options
| -rw-r--r-- | clang-tools-extra/clang-rename/tool/ClangRename.cpp | 11 | ||||
| -rw-r--r-- | clang-tools-extra/docs/clang-rename.rst | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/clang-tools-extra/clang-rename/tool/ClangRename.cpp b/clang-tools-extra/clang-rename/tool/ClangRename.cpp index dcbfd2a310e..4a964ef9ce4 100644 --- a/clang-tools-extra/clang-rename/tool/ClangRename.cpp +++ b/clang-tools-extra/clang-rename/tool/ClangRename.cpp @@ -59,10 +59,8 @@ static int helpMain(int argc, const char *argv[]); /// \brief An oldname -> newname rename. struct RenameAllInfo { std::string OldName; - unsigned Offset; + unsigned Offset = 0; std::string NewName; - - RenameAllInfo() : Offset(0) {} }; LLVM_YAML_IS_SEQUENCE_VECTOR(RenameAllInfo) @@ -70,7 +68,7 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(RenameAllInfo) namespace llvm { namespace yaml { -/// \brief Specialized MappingTraits to describe how a RenameAllInfo is / +/// \brief Specialized MappingTraits to describe how a RenameAllInfo is /// (de)serialized. template <> struct MappingTraits<RenameAllInfo> { static void mapping(IO &IO, RenameAllInfo &Info) { @@ -149,11 +147,12 @@ int subcommandMain(bool isRenameAll, int argc, const char **argv) { if (!Input.empty()) { // Populate OldNames and NewNames from a YAML file. - auto Buffer = llvm::MemoryBuffer::getFile(Input); + ErrorOr<std::unique_ptr<MemoryBuffer>> Buffer = + llvm::MemoryBuffer::getFile(Input); if (!Buffer) { errs() << "clang-rename: failed to read " << Input << ": " << Buffer.getError().message() << "\n"; - exit(1); + return 1; } std::vector<RenameAllInfo> Infos; diff --git a/clang-tools-extra/docs/clang-rename.rst b/clang-tools-extra/docs/clang-rename.rst index 5d753446e40..382998f5521 100644 --- a/clang-tools-extra/docs/clang-rename.rst +++ b/clang-tools-extra/docs/clang-rename.rst @@ -42,7 +42,7 @@ To get an offset of a symbol in a file run $ grep -FUbo 'foo' file.cpp -The tool currently supports renaming actions inside a single Translation Unit +The tool currently supports renaming actions inside a single translation unit only. It is planned to extend the tool's functionality to support multi-TU renaming actions in the future. |
