Unverified Commit b3a39a9b authored by Louis Dionne's avatar Louis Dionne Committed by GitHub
Browse files

[libc++] Check formatting with clang-format 17 (#68928) 

This updates the clang-format we use in libc++ to 17. This is necessary
to start running the generated-files checks in GitHub Actions (in
#68920). In fact this is a pre-existing issue regardless of #68920 --
right now our ignore_format.txt job disagrees with the LLVM-wide
clang-format job.
parent 403e0e8c

libcxx/include/__ranges/to.h

+2 −4
Original line number Diff line number Diff line
@@ -211,9 +211,7 @@ _LIBCPP_NODISCARD_EXT _LIBCPP_HIDE_FROM_ABI constexpr auto to(_Args&&... __args) 
    requires requires { //

      /**/ ranges::to<_Container>(std::forward<_Range>(__range), std::forward<_Tail>(__tail)...);

    }

  {

    return ranges::to<_Container>(std::forward<_Range>(__range), std::forward<_Tail>(__tail)...);

  };

  { return ranges::to<_Container>(std::forward<_Range>(__range), std::forward<_Tail>(__tail)...); };



  return __range_adaptor_closure_t(std::__bind_back(__to_func, std::forward<_Args>(__args)...));

}

libcxx/test/std/strings/basic.string/string.cons/implicit_deduction_guides.pass.cpp

+135 −132
Original line number Diff line number Diff line
@@ -50,13 +50,15 @@ TEST_CONSTEXPR_CXX20 bool test() { 
  {

    // Testing (1)

    // Nothing to do. Cannot deduce without any arguments.

  } {

  }

  {

    // Testing (2)

    // This overload isn't compatible with implicit deduction guides as

    // specified in the standard.

    // const test_allocator<char> alloc{};

    // std::basic_string s(alloc);

  } { // Testing (3) w/o allocator

  }

  { // Testing (3) w/o allocator

    std::basic_string s(6ull, 'a');

    ASSERT_SAME_TYPE(decltype(s), std::string);

    assert(s == "aaaaaa");
@@ -188,7 +190,8 @@ TEST_CONSTEXPR_CXX20 bool test() { 
    assert(s == "abc");

  }

  { // (8) w/ allocator

   {using Expect = std::basic_string<char, std::char_traits<char>, test_allocator<char>>;

    {

      using Expect      = std::basic_string<char, std::char_traits<char>, test_allocator<char>>;

      using It          = cpp17_input_iterator<const char*>;

      const char* input = "abcdef";

      std::basic_string s(It(input), It(input + 3), test_allocator<char>{});

libcxx/test/std/strings/string.view/string.view.cons/implicit_deduction_guides.pass.cpp

+4 −3
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ int main(int, char**) { 
  {

    // Testing (1)

    // Nothing to do. Cannot deduce without any arguments.

  } { // Testing (2)

  }

  { // Testing (2)

    const std::string_view sin("abc");

    std::basic_string_view s(sin);

    ASSERT_SAME_TYPE(decltype(s), std::string_view);

libcxx/utils/ci/buildkite-pipeline.yml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ env: 
    # LLVM POST-BRANCH bump version

    # LLVM POST-BRANCH add compiler test for ToT - 1, e.g. "Clang 17"

    # LLVM RELEASE bump remove compiler ToT - 3, e.g. "Clang 15"

    LLVM_STABLE_VERSION: "16" # Used for tooling, update after the RELEASE.

    LLVM_STABLE_VERSION: "17" # Used for tooling, update after the RELEASE.

    LLVM_HEAD_VERSION: "18"   # Used compiler, update POST-BRANCH.

    GCC_STABLE_VERSION: "13"

steps:

libcxx/utils/data/ignore_format.txt

+0 −6
Original line number Diff line number Diff line
@@ -5265,7 +5265,6 @@ libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/ba 
libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/ctor.default.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/ctor.outer_iterator.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/increment.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/iter_move.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/iter_swap.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/types.compile.pass.cpp
@@ -5275,11 +5274,8 @@ libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/ct 
libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/types.compile.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer.value/ctor.default.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer.value/view_interface.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.lazy.split/types.h

libcxx/test/std/ranges/range.adaptors/range.lazy.split/view_interface.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.reverse/adaptor.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.reverse/base.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.reverse/begin.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.reverse/borrowing.compile.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.reverse/ctad.compile.pass.cpp
@@ -5300,7 +5296,6 @@ libcxx/test/std/ranges/range.adaptors/range.take/ctad.compile.pass.cpp 
libcxx/test/std/ranges/range.adaptors/range.take/ctor.default.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.take/range_concept_conformance.compile.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.take/sentinel/ctor.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.take/sentinel/eq.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.take/size.pass.cpp

libcxx/test/std/ranges/range.adaptors/range.take/types.h

libcxx/test/std/ranges/range.adaptors/range.take.while/adaptor.pass.cpp
@@ -5357,7 +5352,6 @@ libcxx/test/std/ranges/range.factories/range.iota.view/iterator/ctor.value.pass. 
libcxx/test/std/ranges/range.factories/range.iota.view/iterator/decrement.pass.cpp

libcxx/test/std/ranges/range.factories/range.iota.view/iterator/increment.pass.cpp

libcxx/test/std/ranges/range.factories/range.iota.view/iterator/member_typedefs.compile.pass.cpp

libcxx/test/std/ranges/range.factories/range.iota.view/iterator/minus.pass.cpp

libcxx/test/std/ranges/range.factories/range.iota.view/iterator/star.pass.cpp

libcxx/test/std/ranges/range.factories/range.iota.view/iterator/subscript.pass.cpp

libcxx/test/std/ranges/range.factories/range.iota.view/range_concept_conformance.compile.pass.cpp

libcxx/include/__type_traits/promote.h

+1 −1

File changed.

Contains only whitespace changes.

libcxx/test/support/counting_projection.h

+1 −1

File changed.

Contains only whitespace changes.

libcxx/include/__concepts/swappable.h

+1 −1

File changed.

Contains only whitespace changes.