[llvm] 96685fa - [llvm] Use early exits and get rid of if-return-else-return pattern; NFC
Kirill Bobyrev via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 21 05:19:01 PDT 2020
Author: Kirill Bobyrev
Date: 2020-10-21T14:18:42+02:00
New Revision: 96685faf6dd9b044394af6f7a9d8b10fadb327b5
URL: https://github.com/llvm/llvm-project/commit/96685faf6dd9b044394af6f7a9d8b10fadb327b5
DIFF: https://github.com/llvm/llvm-project/commit/96685faf6dd9b044394af6f7a9d8b10fadb327b5.diff
LOG: [llvm] Use early exits and get rid of if-return-else-return pattern; NFC
https://llvm.org/docs/CodingStandards.html#use-early-exits-and-continue-to-simplify-code
Reviewed By: kadircet
Differential Revision: https://reviews.llvm.org/D89857
Added:
Modified:
llvm/lib/Support/Path.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Support/Path.cpp b/llvm/lib/Support/Path.cpp
index bbc02a246a50..ef223ae5ac1d 100644
--- a/llvm/lib/Support/Path.cpp
+++ b/llvm/lib/Support/Path.cpp
@@ -354,10 +354,9 @@ StringRef root_path(StringRef path, Style style) {
if ((++pos != e) && is_separator((*pos)[0], style)) {
// {C:/,//net/}, so get the first two components.
return path.substr(0, b->size() + pos->size());
- } else {
- // just {C:,//net}, return the first component.
- return *b;
}
+ // just {C:,//net}, return the first component.
+ return *b;
}
// POSIX style root directory.
@@ -467,8 +466,7 @@ StringRef parent_path(StringRef path, Style style) {
size_t end_pos = parent_path_end(path, style);
if (end_pos == StringRef::npos)
return StringRef();
- else
- return path.substr(0, end_pos);
+ return path.substr(0, end_pos);
}
void remove_filename(SmallVectorImpl<char> &path, Style style) {
@@ -581,12 +579,10 @@ StringRef stem(StringRef path, Style style) {
size_t pos = fname.find_last_of('.');
if (pos == StringRef::npos)
return fname;
- else
- if ((fname.size() == 1 && fname == ".") ||
- (fname.size() == 2 && fname == ".."))
- return fname;
- else
- return fname.substr(0, pos);
+ if ((fname.size() == 1 && fname == ".") ||
+ (fname.size() == 2 && fname == ".."))
+ return fname;
+ return fname.substr(0, pos);
}
StringRef extension(StringRef path, Style style) {
@@ -594,12 +590,10 @@ StringRef extension(StringRef path, Style style) {
size_t pos = fname.find_last_of('.');
if (pos == StringRef::npos)
return StringRef();
- else
- if ((fname.size() == 1 && fname == ".") ||
- (fname.size() == 2 && fname == ".."))
- return StringRef();
- else
- return fname.substr(pos);
+ if ((fname.size() == 1 && fname == ".") ||
+ (fname.size() == 2 && fname == ".."))
+ return StringRef();
+ return fname.substr(pos);
}
bool is_separator(char value, Style style) {
@@ -1299,7 +1293,7 @@ Expected<TempFile> TempFile::create(const Twine &Model, unsigned Mode) {
#endif
return std::move(Ret);
}
-}
+} // namespace fs
-} // end namsspace sys
-} // end namespace llvm
+} // namespace sys
+} // namespace llvm
More information about the llvm-commits
mailing list