[llvm] 272bcb2 - [ADT] Remove llvm::Optional::transform
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Thu Dec 15 09:25:00 PST 2022
Author: Kazu Hirata
Date: 2022-12-15T09:24:54-08:00
New Revision: 272bcb232f07d081cbfe88270f3b732f150e7cc1
URL: https://github.com/llvm/llvm-project/commit/272bcb232f07d081cbfe88270f3b732f150e7cc1
DIFF: https://github.com/llvm/llvm-project/commit/272bcb232f07d081cbfe88270f3b732f150e7cc1.diff
LOG: [ADT] Remove llvm::Optional::transform
I've removed the last uses of transform on Dec 14, 2022 in commit
230df792e17519071a9ef4dc0fb10132540dfbb8.
Differential Revision: https://reviews.llvm.org/D140082
Added:
Modified:
llvm/include/llvm/ADT/Optional.h
llvm/unittests/ADT/OptionalTest.cpp
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/Optional.h b/llvm/include/llvm/ADT/Optional.h
index 670273868ebba..2b8940cdf7e80 100644
--- a/llvm/include/llvm/ADT/Optional.h
+++ b/llvm/include/llvm/ADT/Optional.h
@@ -284,29 +284,12 @@ template <typename T> class Optional {
return has_value() ? value() : std::forward<U>(alt);
}
- /// Apply a function to the value if present; otherwise return std::nullopt.
- template <class Function>
- auto transform(const Function &F) const & -> Optional<decltype(F(value()))> {
- if (*this)
- return F(value());
- return std::nullopt;
- }
-
T &&value() && { return std::move(Storage.value()); }
T &&operator*() && { return std::move(Storage.value()); }
template <typename U> T value_or(U &&alt) && {
return has_value() ? std::move(value()) : std::forward<U>(alt);
}
-
- /// Apply a function to the value if present; otherwise return std::nullopt.
- template <class Function>
- auto transform(
- const Function &F) && -> Optional<decltype(F(std::move(*this).value()))> {
- if (*this)
- return F(std::move(*this).value());
- return std::nullopt;
- }
};
template<typename T>
diff --git a/llvm/unittests/ADT/OptionalTest.cpp b/llvm/unittests/ADT/OptionalTest.cpp
index b192d5321b28b..bc344a2d8c8a0 100644
--- a/llvm/unittests/ADT/OptionalTest.cpp
+++ b/llvm/unittests/ADT/OptionalTest.cpp
@@ -573,40 +573,6 @@ TEST(OptionalTest, MoveValueOr) {
EXPECT_EQ(2u, MoveOnly::Destructions);
}
-TEST(OptionalTest, Transform) {
- Optional<int> A;
-
- Optional<int> B = A.transform([&](int N) { return N + 1; });
- EXPECT_FALSE(B.has_value());
-
- A = 3;
- Optional<int> C = A.transform([&](int N) { return N + 1; });
- EXPECT_TRUE(C.has_value());
- EXPECT_EQ(4, C.value());
-}
-
-TEST(OptionalTest, MoveTransform) {
- Optional<MoveOnly> A;
-
- MoveOnly::ResetCounts();
- Optional<int> B =
- std::move(A).transform([&](const MoveOnly &M) { return M.val + 2; });
- EXPECT_FALSE(B.has_value());
- EXPECT_EQ(0u, MoveOnly::MoveConstructions);
- EXPECT_EQ(0u, MoveOnly::MoveAssignments);
- EXPECT_EQ(0u, MoveOnly::Destructions);
-
- A = MoveOnly(5);
- MoveOnly::ResetCounts();
- Optional<int> C =
- std::move(A).transform([&](const MoveOnly &M) { return M.val + 2; });
- EXPECT_TRUE(C.has_value());
- EXPECT_EQ(7, C.value());
- EXPECT_EQ(0u, MoveOnly::MoveConstructions);
- EXPECT_EQ(0u, MoveOnly::MoveAssignments);
- EXPECT_EQ(0u, MoveOnly::Destructions);
-}
-
struct EqualTo {
template <typename T, typename U> static bool apply(const T &X, const U &Y) {
return X == Y;
More information about the llvm-commits
mailing list