[llvm] b0b2b2e - Revert "[ADT] add StringViewExtras llvm::starts_with for std::string_view"

Nick Desaulniers via llvm-commits llvm-commits at lists.llvm.org
Mon Apr 17 13:17:07 PDT 2023


Author: Nick Desaulniers
Date: 2023-04-17T13:16:52-07:00
New Revision: b0b2b2e047caa5a7c4b7e15d4425493f2df18d79

URL: https://github.com/llvm/llvm-project/commit/b0b2b2e047caa5a7c4b7e15d4425493f2df18d79
DIFF: https://github.com/llvm/llvm-project/commit/b0b2b2e047caa5a7c4b7e15d4425493f2df18d79.diff

LOG: Revert "[ADT] add StringViewExtras llvm::starts_with for std::string_view"

This reverts commit d6d30dd9590b41fbcdc88b43767b27a31bfb1c73.

These helpers were added to be used by LLVMDemangle, which would be a
layering violation for that to depend on LLVMSupport. Undo this commit,
and I'll these these directly in LLVMDemangle.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D148547

Added: 
    

Modified: 
    llvm/unittests/ADT/CMakeLists.txt

Removed: 
    llvm/include/llvm/ADT/StringViewExtras.h
    llvm/unittests/ADT/StringViewExtrasTest.cpp


################################################################################
diff  --git a/llvm/include/llvm/ADT/StringViewExtras.h b/llvm/include/llvm/ADT/StringViewExtras.h
deleted file mode 100644
index 5508371912619..0000000000000
--- a/llvm/include/llvm/ADT/StringViewExtras.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//===- llvm/ADT/StringViewExtras.h - Useful string_view functions C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-///
-/// \file
-/// This file contains some functions that are useful when dealing with
-/// string_views.
-///
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_ADT_STRINGVIEWEXTRAS_H
-#define LLVM_ADT_STRINGVIEWEXTRAS_H
-
-#include <string_view>
-
-namespace llvm {
-
-// FIXME: std::string_view::starts_with is not available until C++20. Once LLVM
-// is upgraded to C++20, remove this header and users.
-
-inline constexpr bool starts_with(std::string_view self, char C) {
-  return !self.empty() && self.front() == C;
-}
-inline constexpr bool starts_with(std::string_view haystack,
-                                  std::string_view needle) {
-  return haystack.substr(0, needle.size()) == needle;
-}
-
-} // end namespace llvm
-
-#endif // LLVM_ADT_STRINGVIEWEXTRAS_H

diff  --git a/llvm/unittests/ADT/CMakeLists.txt b/llvm/unittests/ADT/CMakeLists.txt
index f6e416406acf9..c5190255ba773 100644
--- a/llvm/unittests/ADT/CMakeLists.txt
+++ b/llvm/unittests/ADT/CMakeLists.txt
@@ -79,7 +79,6 @@ add_llvm_unittest(ADTTests
   StringRefTest.cpp
   StringSetTest.cpp
   StringSwitchTest.cpp
-  StringViewExtrasTest.cpp
   TinyPtrVectorTest.cpp
   TwineTest.cpp
   TypeSwitchTest.cpp

diff  --git a/llvm/unittests/ADT/StringViewExtrasTest.cpp b/llvm/unittests/ADT/StringViewExtrasTest.cpp
deleted file mode 100644
index ffbbcb4d202a3..0000000000000
--- a/llvm/unittests/ADT/StringViewExtrasTest.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- StringExtrasTest.cpp - Unit tests for String extras ----------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "llvm/ADT/StringViewExtras.h"
-#include "llvm/Support/raw_ostream.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
-
-#include <string_view>
-
-using namespace llvm;
-
-TEST(StringViewExtrasTest, starts_with) {
-  std::string haystack = "hello world";
-  EXPECT_TRUE(llvm::starts_with(haystack, 'h'));
-  EXPECT_FALSE(llvm::starts_with(haystack, '\0'));
-  EXPECT_TRUE(llvm::starts_with(haystack, "hello"));
-  // TODO: should this 
diff er from \0?
-  EXPECT_TRUE(llvm::starts_with(haystack, ""));
-
-  std::string empty;
-  EXPECT_FALSE(llvm::starts_with(empty, 'h'));
-  EXPECT_FALSE(llvm::starts_with(empty, '\0'));
-  EXPECT_FALSE(llvm::starts_with(empty, "hello"));
-  // TODO: should this 
diff er from \0?
-  EXPECT_TRUE(llvm::starts_with(empty, ""));
-}


        


More information about the llvm-commits mailing list