From 585fcaefd5400e47b93987225cb911c502825985 Mon Sep 17 00:00:00 2001 From: Gleb Shigin Date: Wed, 29 Jul 2026 14:28:46 +0000 Subject: [PATCH 1/2] change third party scope_exit to std::experimental --- pp/BUILD | 1 - pp/MODULE.bazel | 1 - pp/bare_bones/bit_sequence.h | 2 +- pp/bare_bones/crc32.h | 2 +- pp/bare_bones/encoding.h | 2 +- pp/bare_bones/serializer.h | 4 ++-- pp/bare_bones/snug_composite.h | 2 +- pp/bare_bones/stream_v_byte.h | 2 +- pp/bare_bones/vector.h | 2 +- pp/primitives/snug_composites_filaments.h | 2 +- pp/third_party/cedar.BUILD | 5 +---- pp/third_party/deps.bzl | 8 -------- pp/third_party/patches/cedar/0001-cedarpp.h.patch | 2 +- pp/third_party/scope_exit.BUILD | 11 ----------- pp/wal/wal.h | 2 +- 15 files changed, 12 insertions(+), 36 deletions(-) delete mode 100644 pp/third_party/scope_exit.BUILD diff --git a/pp/BUILD b/pp/BUILD index 2a39986e1a..c212ca7fc0 100644 --- a/pp/BUILD +++ b/pp/BUILD @@ -22,7 +22,6 @@ cc_library( "//third_party", "@lz4", "@parallel_hashmap", - "@scope_exit", "@xxHash", "@roaring", ], diff --git a/pp/MODULE.bazel b/pp/MODULE.bazel index 98c921b6a8..d47647fb1a 100644 --- a/pp/MODULE.bazel +++ b/pp/MODULE.bazel @@ -77,7 +77,6 @@ use_repo( "quasis_crypto", "re2", "roaring", - "scope_exit", "simdutf", "snappy", "xxHash", diff --git a/pp/bare_bones/bit_sequence.h b/pp/bare_bones/bit_sequence.h index 2c965529cf..b75b8adb74 100644 --- a/pp/bare_bones/bit_sequence.h +++ b/pp/bare_bones/bit_sequence.h @@ -10,7 +10,7 @@ #include #endif -#include +#include #include #include "bit.h" diff --git a/pp/bare_bones/crc32.h b/pp/bare_bones/crc32.h index f2f07ed2f9..fdeeb2f02e 100644 --- a/pp/bare_bones/crc32.h +++ b/pp/bare_bones/crc32.h @@ -12,7 +12,7 @@ #include #endif -#include +#include #include "bare_bones/exception.h" #include "bare_bones/streams.h" diff --git a/pp/bare_bones/encoding.h b/pp/bare_bones/encoding.h index 175484431e..038ebf5e2e 100644 --- a/pp/bare_bones/encoding.h +++ b/pp/bare_bones/encoding.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "bit_sequence.h" #include "exception.h" diff --git a/pp/bare_bones/serializer.h b/pp/bare_bones/serializer.h index e18a1577c7..4694dde802 100644 --- a/pp/bare_bones/serializer.h +++ b/pp/bare_bones/serializer.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include "exception.h" @@ -49,4 +49,4 @@ void deserialize(std::istream& stream, Vector& vector) { } } -} // namespace BareBones \ No newline at end of file +} // namespace BareBones diff --git a/pp/bare_bones/snug_composite.h b/pp/bare_bones/snug_composite.h index aa377ff7f0..3713c31603 100644 --- a/pp/bare_bones/snug_composite.h +++ b/pp/bare_bones/snug_composite.h @@ -6,7 +6,7 @@ #include #pragma GCC diagnostic pop -#include +#include #include #include diff --git a/pp/bare_bones/stream_v_byte.h b/pp/bare_bones/stream_v_byte.h index 4e2587f73d..33f939679d 100644 --- a/pp/bare_bones/stream_v_byte.h +++ b/pp/bare_bones/stream_v_byte.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include "bare_bones/iterator.h" #include "exception.h" diff --git a/pp/bare_bones/vector.h b/pp/bare_bones/vector.h index 6de26cb0cb..00eb94f424 100644 --- a/pp/bare_bones/vector.h +++ b/pp/bare_bones/vector.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "allocated_memory.h" #include "exception.h" diff --git a/pp/primitives/snug_composites_filaments.h b/pp/primitives/snug_composites_filaments.h index 1918994005..8ea0996200 100644 --- a/pp/primitives/snug_composites_filaments.h +++ b/pp/primitives/snug_composites_filaments.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include diff --git a/pp/third_party/cedar.BUILD b/pp/third_party/cedar.BUILD index 6e01e74947..4427bb11bb 100644 --- a/pp/third_party/cedar.BUILD +++ b/pp/third_party/cedar.BUILD @@ -2,8 +2,5 @@ cc_library( name = "cedar", hdrs = ["cedar.h", "cedarpp.h"], include_prefix = "cedar", - deps = [ - "@scope_exit", - ], visibility = ["//visibility:public"], -) \ No newline at end of file +) diff --git a/pp/third_party/deps.bzl b/pp/third_party/deps.bzl index b46aed4628..ec136e204a 100644 --- a/pp/third_party/deps.bzl +++ b/pp/third_party/deps.bzl @@ -80,14 +80,6 @@ def _third_party_deps_impl(_ctx): url = "https://github.com/greg7mdp/parallel-hashmap/archive/refs/tags/1.35.zip", ) - http_archive( - name = "scope_exit", - build_file = Label("//third_party:scope_exit.BUILD"), - sha256 = "9428fcdf00714e25fc7c67c28faf0821787b3234165b542a7f2223f464747d83", - strip_prefix = "SC22WG21_Papers-7f9c58dabea6872f86f7960157e2ca38880e14cb/workspace/P0052_scope_exit/src", - url = "https://github.com/PeterSommerlad/SC22WG21_Papers/archive/7f9c58dabea6872f86f7960157e2ca38880e14cb.zip", - ) - http_archive( name = "lz4", build_file = Label("//third_party:lz4.BUILD"), diff --git a/pp/third_party/patches/cedar/0001-cedarpp.h.patch b/pp/third_party/patches/cedar/0001-cedarpp.h.patch index 84a6f5ea10..20ef899833 100644 --- a/pp/third_party/patches/cedar/0001-cedarpp.h.patch +++ b/pp/third_party/patches/cedar/0001-cedarpp.h.patch @@ -7,7 +7,7 @@ +#include +#include + -+#include ++#include #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pp/third_party/scope_exit.BUILD b/pp/third_party/scope_exit.BUILD deleted file mode 100644 index 0543dbfc00..0000000000 --- a/pp/third_party/scope_exit.BUILD +++ /dev/null @@ -1,11 +0,0 @@ -cc_library( - name = "scope_exit", - srcs = [ - "_scope_guard_common.h", - ], - hdrs = [ - "scope_exit.h", - ], - includes = ["."], - visibility = ["//visibility:public"], -) diff --git a/pp/wal/wal.h b/pp/wal/wal.h index 2ed7c418a5..86fd6b8175 100644 --- a/pp/wal/wal.h +++ b/pp/wal/wal.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include #include #include From 85c92ad582281135a0939110fbc29917d5ed9ad1 Mon Sep 17 00:00:00 2001 From: Gleb Shigin Date: Wed, 29 Jul 2026 15:23:49 +0000 Subject: [PATCH 2/2] formatter fix --- pp/primitives/snug_composites_filaments.h | 2 +- pp/wal/wal.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pp/primitives/snug_composites_filaments.h b/pp/primitives/snug_composites_filaments.h index 8ea0996200..8aa2814bb0 100644 --- a/pp/primitives/snug_composites_filaments.h +++ b/pp/primitives/snug_composites_filaments.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include #include "bare_bones/exception.h" diff --git a/pp/wal/wal.h b/pp/wal/wal.h index 86fd6b8175..71a27b2c23 100644 --- a/pp/wal/wal.h +++ b/pp/wal/wal.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include #include #include