Internal cleanup PiperOrigin-RevId: 951638880 Change-Id: Id86a5ccc55b9433fd7415614a58e42bca15ce647
diff --git a/absl/status/BUILD.bazel b/absl/status/BUILD.bazel index 287c9e8..5a611ec 100644 --- a/absl/status/BUILD.bazel +++ b/absl/status/BUILD.bazel
@@ -164,6 +164,7 @@ deps = [ ":status", ":statusor", + "//absl/base:core_headers", "@google_benchmark//:benchmark_main", ], ) @@ -234,7 +235,6 @@ ":status_builder", ":status_macros", ":statusor", - "//absl/base:core_headers", "//absl/strings:string_view", "//absl/types:source_location", "@googletest//:gtest",
diff --git a/absl/status/internal/status_internal.cc b/absl/status/internal/status_internal.cc index f58519b..3f24621 100644 --- a/absl/status/internal/status_internal.cc +++ b/absl/status/internal/status_internal.cc
@@ -32,8 +32,8 @@ #include "absl/debugging/leak_check.h" #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" +#include "absl/functional/function_ref.h" #include "absl/hash/hash.h" -#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/status_payload_printer.h" #include "absl/strings/cord.h"
diff --git a/absl/status/internal/status_matchers.cc b/absl/status/internal/status_matchers.cc index c2912bb..7252d18 100644 --- a/absl/status/internal/status_matchers.cc +++ b/absl/status/internal/status_matchers.cc
@@ -56,7 +56,7 @@ return false; } - if (!message_matcher_.Matches(std::string(status.message()))) { + if (!message_matcher_.Matches(status.message())) { *result_listener << "whose error message is wrong"; return false; }
diff --git a/absl/status/internal/status_matchers.h b/absl/status/internal/status_matchers.h index 5446840..b7425e1 100644 --- a/absl/status/internal/status_matchers.h +++ b/absl/status/internal/status_matchers.h
@@ -123,7 +123,7 @@ explicit operator int() const { return static_cast<int>(code_); } - friend inline void PrintTo(const StatusCode& code, std::ostream* os) { + friend void PrintTo(const StatusCode& code, std::ostream* os) { absl::string_view text = absl::StatusCodeToStringView(static_cast<absl::StatusCode>(code.code_)); if (!text.empty()) {
diff --git a/absl/status/internal/statusor_internal.h b/absl/status/internal/statusor_internal.h index c42891f..9327681 100644 --- a/absl/status/internal/statusor_internal.h +++ b/absl/status/internal/statusor_internal.h
@@ -621,7 +621,7 @@ } public: - static inline absl::string_view OpenBrackets() { + static absl::string_view OpenBrackets() { switch (RandomBraces()) { case kBareParens: return "("; @@ -635,7 +635,7 @@ return "("; } - static inline absl::string_view CloseBrackets() { + static absl::string_view CloseBrackets() { switch (RandomBraces()) { case kBareParens: return ")";
diff --git a/absl/status/status.cc b/absl/status/status.cc index 18adf51..2d3ccc0 100644 --- a/absl/status/status.cc +++ b/absl/status/status.cc
@@ -15,29 +15,19 @@ #include <errno.h> -#include <atomic> -#include <cstddef> #include <cstdint> -#include <cstring> #include <memory> #include <ostream> #include <string> #include <type_traits> #include <utility> -#include "absl/base/attributes.h" #include "absl/base/config.h" -#include "absl/base/internal/raw_logging.h" #include "absl/base/internal/strerror.h" -#include "absl/base/macros.h" #include "absl/base/no_destructor.h" #include "absl/base/nullability.h" -#include "absl/debugging/stacktrace.h" -#include "absl/debugging/symbolize.h" #include "absl/status/internal/status_internal.h" #include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" -#include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "absl/types/source_location.h"
diff --git a/absl/status/status.h b/absl/status/status.h index 0b39b9b..10e22d6 100644 --- a/absl/status/status.h +++ b/absl/status/status.h
@@ -319,22 +319,22 @@ // absl::StatusToStringMode is specified as a bitmask type, which means the // following operations must be provided: -inline constexpr StatusToStringMode operator&(StatusToStringMode lhs, - StatusToStringMode rhs) { +constexpr StatusToStringMode operator&(StatusToStringMode lhs, + StatusToStringMode rhs) { return static_cast<StatusToStringMode>(static_cast<int>(lhs) & static_cast<int>(rhs)); } -inline constexpr StatusToStringMode operator|(StatusToStringMode lhs, - StatusToStringMode rhs) { +constexpr StatusToStringMode operator|(StatusToStringMode lhs, + StatusToStringMode rhs) { return static_cast<StatusToStringMode>(static_cast<int>(lhs) | static_cast<int>(rhs)); } -inline constexpr StatusToStringMode operator^(StatusToStringMode lhs, - StatusToStringMode rhs) { +constexpr StatusToStringMode operator^(StatusToStringMode lhs, + StatusToStringMode rhs) { return static_cast<StatusToStringMode>(static_cast<int>(lhs) ^ static_cast<int>(rhs)); } -inline constexpr StatusToStringMode operator~(StatusToStringMode arg) { +constexpr StatusToStringMode operator~(StatusToStringMode arg) { return static_cast<StatusToStringMode>(~static_cast<int>(arg)); } inline StatusToStringMode& operator&=(StatusToStringMode& lhs, @@ -769,9 +769,9 @@ // Converts between StatusRep* and the external uintptr_t representation used // by rep_. See rep_ for details. - static uintptr_t PointerToRep(status_internal::StatusRep* absl_nonnull r); + static uintptr_t PointerToRep(status_internal::StatusRep* absl_nonnull rep); static const status_internal::StatusRep* absl_nonnull RepToPointer( - uintptr_t r); + uintptr_t rep); static std::string ToStringSlow(uintptr_t rep, StatusToStringMode mode);
diff --git a/absl/status/status_builder.cc b/absl/status/status_builder.cc index 929dead..8b30f61 100644 --- a/absl/status/status_builder.cc +++ b/absl/status/status_builder.cc
@@ -40,7 +40,7 @@ // These constructors are not-inlined and defined in the .cc file to reduce // binary size. See cl/354351433 for a quantification. -StatusBuilder::StatusBuilder() {} +StatusBuilder::StatusBuilder() = default; StatusBuilder::StatusBuilder(const absl::Status& original_status, absl::SourceLocation location) @@ -53,7 +53,7 @@ StatusBuilder::Rep::Rep(const absl::Status& s) : status(s) {} StatusBuilder::Rep::Rep(absl::Status&& s) : status(std::move(s)) {} -StatusBuilder::Rep::~Rep() {} +StatusBuilder::Rep::~Rep() = default; StatusBuilder::Rep* StatusBuilder::InitRepImpl(absl::Status s) { if (s.ok()) {
diff --git a/absl/status/status_macros_test.cc b/absl/status/status_macros_test.cc index 01ebdbf..7b5751d 100644 --- a/absl/status/status_macros_test.cc +++ b/absl/status/status_macros_test.cc
@@ -24,8 +24,6 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/base/attributes.h" -#include "absl/base/optimization.h" #include "absl/status/status.h" #include "absl/status/status_builder.h" #include "absl/status/statusor.h"
diff --git a/absl/status/statusor.h b/absl/status/statusor.h index 8d8247f..2ee7947 100644 --- a/absl/status/statusor.h +++ b/absl/status/statusor.h
@@ -362,8 +362,8 @@ // of passing absl::StatusCode::kInternal as a fallback. template <typename U = absl::Status, std::enable_if_t<internal_statusor::IsConstructionFromStatusValid< - false, T, U>::value, - int> = 0> + false, T, U>::value, + int> = 0> StatusOr(U&& v) : Base(std::forward<U>(v)) {} template <typename U = absl::Status,
diff --git a/absl/status/statusor_benchmark.cc b/absl/status/statusor_benchmark.cc index bb99547..ac353bb 100644 --- a/absl/status/statusor_benchmark.cc +++ b/absl/status/statusor_benchmark.cc
@@ -12,8 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <cstdint> #include <string> +#include <utility> +#include "absl/base/attributes.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "benchmark/benchmark.h"
diff --git a/absl/status/statusor_test.cc b/absl/status/statusor_test.cc index d03e8be..51f3750 100644 --- a/absl/status/statusor_test.cc +++ b/absl/status/statusor_test.cc
@@ -38,7 +38,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "absl/types/source_location.h" -#include "absl/utility/utility.h" namespace { @@ -87,26 +86,26 @@ class Base1 { public: - virtual ~Base1() {} + virtual ~Base1() = default; int pad; }; class Base2 { public: - virtual ~Base2() {} + virtual ~Base2() = default; int yetotherpad; }; class Derived : public Base1, public Base2 { public: - virtual ~Derived() {} + ~Derived() override = default; int evenmorepad; }; class CopyNoAssign { public: explicit CopyNoAssign(int value) : foo(value) {} - CopyNoAssign(const CopyNoAssign& other) : foo(other.foo) {} + CopyNoAssign(const CopyNoAssign& other) = default; int foo; private: @@ -809,19 +808,19 @@ } struct Copyable { - Copyable() {} - Copyable(const Copyable&) {} - Copyable& operator=(const Copyable&) { return *this; } + Copyable() = default; + Copyable(const Copyable&) = default; + Copyable& operator=(const Copyable&) = default; }; struct MoveOnly { - MoveOnly() {} + MoveOnly() = default; MoveOnly(MoveOnly&&) {} MoveOnly& operator=(MoveOnly&&) { return *this; } }; struct NonMovable { - NonMovable() {} + NonMovable() = default; NonMovable(const NonMovable&) = delete; NonMovable(NonMovable&&) = delete; NonMovable& operator=(const NonMovable&) = delete;