diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 13:32:11 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-12 13:32:11 +0000 |
commit | b0a3dbbc33d0a3a016d925a762f785a8fb523eab (patch) | |
tree | 4fa12f9b7062ae0677b53ae362f5b79ddf15c7dd | |
parent | 905eb413b49ac0fd337d501813069660c3f5613c (diff) |
Replace llvm::error_code with std::error_code.
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@210776 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h | 2 | ||||
-rw-r--r-- | clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp | 2 | ||||
-rw-r--r-- | clang-modernize/Core/IncludeExcludeInfo.h | 8 | ||||
-rw-r--r-- | clang-tidy/ClangTidyOptions.cpp | 8 | ||||
-rw-r--r-- | clang-tidy/ClangTidyOptions.h | 8 | ||||
-rw-r--r-- | clang-tidy/tool/ClangTidyMain.cpp | 2 | ||||
-rw-r--r-- | module-map-checker/ModuleMapChecker.h | 2 | ||||
-rw-r--r-- | unittests/clang-modernize/IncludeDirectivesTest.cpp | 2 | ||||
-rw-r--r-- | unittests/clang-modernize/IncludeExcludeTest.cpp | 16 | ||||
-rw-r--r-- | unittests/clang-modernize/TransformTest.cpp | 4 | ||||
-rw-r--r-- | unittests/clang-tidy/ClangTidyOptionsTest.cpp | 10 | ||||
-rw-r--r-- | unittests/include/common/Utility.h | 2 |
12 files changed, 33 insertions, 33 deletions
diff --git a/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h b/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h index 8589fdb8..2b77e9e4 100644 --- a/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h +++ b/clang-apply-replacements/include/clang-apply-replacements/Tooling/ApplyReplacements.h @@ -65,7 +65,7 @@ FileToReplacementsMap; /// /// \returns An error_code indicating success or failure in navigating the /// directory structure. -llvm::error_code +std::error_code collectReplacementsFromDirectory(const llvm::StringRef Directory, TUReplacements &TUs, TUReplacementFiles &TURFiles, diff --git a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp index 67b8b0f6..b21cd2b7 100644 --- a/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp +++ b/clang-apply-replacements/lib/Tooling/ApplyReplacements.cpp @@ -36,7 +36,7 @@ static void eatDiagnostics(const SMDiagnostic &, void *) {} namespace clang { namespace replace { -llvm::error_code +std::error_code collectReplacementsFromDirectory(const llvm::StringRef Directory, TUReplacements &TUs, TUReplacementFiles & TURFiles, diff --git a/clang-modernize/Core/IncludeExcludeInfo.h b/clang-modernize/Core/IncludeExcludeInfo.h index 16629e64..aa42c658 100644 --- a/clang-modernize/Core/IncludeExcludeInfo.h +++ b/clang-modernize/Core/IncludeExcludeInfo.h @@ -29,16 +29,16 @@ public: /// /// Returns error_code::success() on successful parse of the strings or /// an error_code indicating the encountered error. - llvm::error_code readListFromString(llvm::StringRef IncludeString, - llvm::StringRef ExcludeString); + std::error_code readListFromString(llvm::StringRef IncludeString, + llvm::StringRef ExcludeString); /// \brief Read and parse the lists of paths from \a IncludeListFile /// and \a ExcludeListFile. Each file should contain one path per line. /// /// Returns error_code::success() on successful read and parse of both files /// or an error_code indicating the encountered error. - llvm::error_code readListFromFile(llvm::StringRef IncludeListFile, - llvm::StringRef ExcludeListFile); + std::error_code readListFromFile(llvm::StringRef IncludeListFile, + llvm::StringRef ExcludeListFile); /// \brief Determine if the given path is in the list of include paths but /// not in the list of exclude paths. diff --git a/clang-tidy/ClangTidyOptions.cpp b/clang-tidy/ClangTidyOptions.cpp index 93e12ca0..9e4e33b5 100644 --- a/clang-tidy/ClangTidyOptions.cpp +++ b/clang-tidy/ClangTidyOptions.cpp @@ -62,15 +62,15 @@ namespace clang { namespace tidy { /// \brief Parses -line-filter option and stores it to the \c Options. -llvm::error_code parseLineFilter(const std::string &LineFilter, - clang::tidy::ClangTidyGlobalOptions &Options) { +std::error_code parseLineFilter(const std::string &LineFilter, + clang::tidy::ClangTidyGlobalOptions &Options) { llvm::yaml::Input Input(LineFilter); Input >> Options.LineFilter; return Input.error(); } -llvm::error_code parseConfiguration(const std::string &Config, - clang::tidy::ClangTidyOptions &Options) { +std::error_code parseConfiguration(const std::string &Config, + clang::tidy::ClangTidyOptions &Options) { llvm::yaml::Input Input(Config); Input >> Options; return Input.error(); diff --git a/clang-tidy/ClangTidyOptions.h b/clang-tidy/ClangTidyOptions.h index 7359d768..62346420 100644 --- a/clang-tidy/ClangTidyOptions.h +++ b/clang-tidy/ClangTidyOptions.h @@ -89,12 +89,12 @@ private: }; /// \brief Parses LineFilter from JSON and stores it to the \p Options. -llvm::error_code parseLineFilter(const std::string &LineFilter, - clang::tidy::ClangTidyGlobalOptions &Options); +std::error_code parseLineFilter(const std::string &LineFilter, + clang::tidy::ClangTidyGlobalOptions &Options); /// \brief Parses configuration from JSON and stores it to the \p Options. -llvm::error_code parseConfiguration(const std::string &Config, - clang::tidy::ClangTidyOptions &Options); +std::error_code parseConfiguration(const std::string &Config, + clang::tidy::ClangTidyOptions &Options); } // end namespace tidy } // end namespace clang diff --git a/clang-tidy/tool/ClangTidyMain.cpp b/clang-tidy/tool/ClangTidyMain.cpp index 3447a971..030e4b16 100644 --- a/clang-tidy/tool/ClangTidyMain.cpp +++ b/clang-tidy/tool/ClangTidyMain.cpp @@ -109,7 +109,7 @@ int main(int argc, const char **argv) { CommonOptionsParser OptionsParser(argc, argv, ClangTidyCategory); clang::tidy::ClangTidyGlobalOptions GlobalOptions; - if (llvm::error_code Err = + if (std::error_code Err = clang::tidy::parseLineFilter(LineFilter, GlobalOptions)) { llvm::errs() << "Invalid LineFilter: " << Err.message() << "\n\nUsage:\n"; llvm::cl::PrintHelpMessage(/*Hidden=*/false, /*Categorized=*/true); diff --git a/module-map-checker/ModuleMapChecker.h b/module-map-checker/ModuleMapChecker.h index ee23c484..2159aa47 100644 --- a/module-map-checker/ModuleMapChecker.h +++ b/module-map-checker/ModuleMapChecker.h @@ -137,7 +137,7 @@ public: /// \returns 0 if there were no errors or warnings, 1 if there /// were warnings, 2 if any other problem, such as a bad /// module map path argument was specified. - llvm::error_code doChecks(); + std::error_code doChecks(); // The following functions are called by doChecks. diff --git a/unittests/clang-modernize/IncludeDirectivesTest.cpp b/unittests/clang-modernize/IncludeDirectivesTest.cpp index dfb4b99b..b1352882 100644 --- a/unittests/clang-modernize/IncludeDirectivesTest.cpp +++ b/unittests/clang-modernize/IncludeDirectivesTest.cpp @@ -66,7 +66,7 @@ public: /// refer to the headers by using '\<FileName\>'. std::string makeHeaderFileName(StringRef FileName) const { SmallString<128> Path; - llvm::error_code EC = llvm::sys::fs::current_path(Path); + std::error_code EC = llvm::sys::fs::current_path(Path); assert(!EC); (void)EC; diff --git a/unittests/clang-modernize/IncludeExcludeTest.cpp b/unittests/clang-modernize/IncludeExcludeTest.cpp index 2b703dba..c65d341e 100644 --- a/unittests/clang-modernize/IncludeExcludeTest.cpp +++ b/unittests/clang-modernize/IncludeExcludeTest.cpp @@ -16,11 +16,11 @@ TEST(IncludeExcludeTest, ParseString) { IncludeExcludeInfo IEManager; - llvm::error_code Err = IEManager.readListFromString( + std::error_code Err = IEManager.readListFromString( /*include=*/ "a,b/b2,c/c2,d/../d2/../d3", /*exclude=*/ "a/af.cpp,a/a2,b/b2/b2f.cpp,c/c2"); - ASSERT_EQ(Err, llvm::error_code()); + ASSERT_EQ(Err, std::error_code()); // If the file does not appear on the include list then it is not safe to // transform. Files are not safe to transform by default. @@ -61,11 +61,11 @@ TEST(IncludeExcludeTest, ParseString) { TEST(IncludeExcludeTest, ParseStringCases) { IncludeExcludeInfo IEManager; - llvm::error_code Err = IEManager.readListFromString( + std::error_code Err = IEManager.readListFromString( /*include=*/ "a/.,b/b2/,c/c2/c3/../../c4/,d/d2/./d3/,/e/e2/.", /*exclude=*/ ""); - ASSERT_EQ(Err, llvm::error_code()); + ASSERT_EQ(Err, std::error_code()); EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("b/b2/f.cpp")); @@ -123,10 +123,10 @@ TEST(IncludeExcludeFileTest, UNIXFile) { ASSERT_NO_FATAL_FAILURE(UnixFiles.CreateFiles(/* UnixMode= */true)); IncludeExcludeInfo IEManager; - llvm::error_code Err = IEManager.readListFromFile( + std::error_code Err = IEManager.readListFromFile( UnixFiles.IncludeDataPath.c_str(), UnixFiles.ExcludeDataPath.c_str()); - ASSERT_EQ(Err, llvm::error_code()); + ASSERT_EQ(Err, std::error_code()); EXPECT_FALSE(IEManager.isFileIncluded("f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp")); @@ -138,10 +138,10 @@ TEST(IncludeExcludeFileTest, DOSFile) { ASSERT_NO_FATAL_FAILURE(DOSFiles.CreateFiles(/* UnixMode= */false)); IncludeExcludeInfo IEManager; - llvm::error_code Err = IEManager.readListFromFile( + std::error_code Err = IEManager.readListFromFile( DOSFiles.IncludeDataPath.c_str(), DOSFiles.ExcludeDataPath.c_str()); - ASSERT_EQ(Err, llvm::error_code()); + ASSERT_EQ(Err, std::error_code()); EXPECT_FALSE(IEManager.isFileIncluded("f.cpp")); EXPECT_TRUE(IEManager.isFileIncluded("a/f.cpp")); diff --git a/unittests/clang-modernize/TransformTest.cpp b/unittests/clang-modernize/TransformTest.cpp index 18866c20..ae05f5a4 100644 --- a/unittests/clang-modernize/TransformTest.cpp +++ b/unittests/clang-modernize/TransformTest.cpp @@ -124,7 +124,7 @@ TEST(Transform, Timings) { // file anyway. What is important is that we have an absolute path with which // to use with mapVirtualFile(). SmallString<128> CurrentDir; - llvm::error_code EC = llvm::sys::fs::current_path(CurrentDir); + std::error_code EC = llvm::sys::fs::current_path(CurrentDir); assert(!EC); (void)EC; @@ -237,7 +237,7 @@ TEST(Transform, isFileModifiable) { // file anyway. What is important is that we have an absolute path with which // to use with mapVirtualFile(). SmallString<128> CurrentDir; - llvm::error_code EC = llvm::sys::fs::current_path(CurrentDir); + std::error_code EC = llvm::sys::fs::current_path(CurrentDir); assert(!EC); (void)EC; diff --git a/unittests/clang-tidy/ClangTidyOptionsTest.cpp b/unittests/clang-tidy/ClangTidyOptionsTest.cpp index 0a294d5e..55d8a6da 100644 --- a/unittests/clang-tidy/ClangTidyOptionsTest.cpp +++ b/unittests/clang-tidy/ClangTidyOptionsTest.cpp @@ -31,7 +31,7 @@ TEST(ParseLineFilter, InvalidFilter) { TEST(ParseLineFilter, ValidFilter) { ClangTidyGlobalOptions Options; - llvm::error_code Error = parseLineFilter( + std::error_code Error = parseLineFilter( "[{\"name\":\"file1.cpp\",\"lines\":[[3,15],[20,30],[42,42]]}," "{\"name\":\"file2.h\"}," "{\"name\":\"file3.cc\",\"lines\":[[100,1000]]}]", @@ -56,10 +56,10 @@ TEST(ParseLineFilter, ValidFilter) { TEST(ParseConfiguration, ValidConfiguration) { ClangTidyOptions Options; - llvm::error_code Error = parseConfiguration("Checks: \"-*,misc-*\"\n" - "HeaderFilterRegex: \".*\"\n" - "AnalyzeTemporaryDtors: true\n", - Options); + std::error_code Error = parseConfiguration("Checks: \"-*,misc-*\"\n" + "HeaderFilterRegex: \".*\"\n" + "AnalyzeTemporaryDtors: true\n", + Options); EXPECT_FALSE(Error); EXPECT_EQ("-*,misc-*", Options.Checks); EXPECT_EQ(".*", Options.HeaderFilterRegex); diff --git a/unittests/include/common/Utility.h b/unittests/include/common/Utility.h index c934d480..0cf6a50b 100644 --- a/unittests/include/common/Utility.h +++ b/unittests/include/common/Utility.h @@ -12,7 +12,7 @@ // FIXME: copied from unittests/Support/Path.cpp #define ASSERT_NO_ERROR(x) \ - if (llvm::error_code ASSERT_NO_ERROR_ec = x) { \ + if (std::error_code ASSERT_NO_ERROR_ec = x) { \ llvm::SmallString<128> MessageStorage; \ llvm::raw_svector_ostream Message(MessageStorage); \ Message << #x ": did not return errc::success.\n" \ |