[pull] master from dtolnay:master

.bazelignore

@@ -1,2 +1,3 @@
+buck-out/
 target/
 tools/buck/buck2/

.bazelrc

@@ -1,2 +1,21 @@
+###############################################################################
+## Bazel Configuration Flags
+##
+## `.bazelrc` is a Bazel configuration file.
+## https://bazel.build/docs/best-practices#bazelrc-file
+###############################################################################
+
 build --enable_platform_specific_config
 build:linux --@rules_rust//:extra_rustc_flags=-Clink-arg=-fuse-ld=lld
+build:linux --cxxopt=-std=c++17
+build:macos --cxxopt=-std=c++17
+
+###############################################################################
+## Custom user flags
+##
+## This should always be the last thing in the `.bazelrc` file to ensure
+## consistent behavior when setting flags in that file as `.bazelrc` files are
+## evaluated top to bottom.
+###############################################################################
+
+try-import %workspace%/user.bazelrc

.bcr/README.md

@@ -0,0 +1,9 @@
+# Bazel Central Registry
+
+When the ruleset is released, we want it to be published to the
+Bazel Central Registry automatically:
+<https://registry.bazel.build>
+
+This folder contains configuration files to automate the publish step.
+See <https://github.com/bazel-contrib/publish-to-bcr/blob/main/templates/README.md>
+for authoritative documentation about these files.

.bcr/config.yml

@@ -0,0 +1,3 @@
+fixedReleaser:
+  login: dtolnay
+  email: dtolnay@gmail.com

.bcr/metadata.template.json

@@ -0,0 +1,16 @@
+{
+  "homepage": "https://cxx.rs",
+  "maintainers": [
+    {
+      "github": "dtolnay",
+      "github_user_id": 1940490,
+      "email": "dtolnay@gmail.com",
+      "name": "David Tolnay"
+    }
+  ],
+  "repository": [
+    "github:dtolnay/cxx"
+  ],
+  "versions": [],
+  "yanked_versions": {}
+}

.bcr/presubmit.yml

@@ -0,0 +1,15 @@
+matrix:
+  platform:
+    - macos_arm64
+    - ubuntu2404
+    - windows
+  bazel: [8.x, 9.x]
+tasks:
+  verify_targets:
+    name: Verify build targets
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_targets:
+      - '@cxx.rs//...'
+    test_targets:
+      - '@cxx.rs//...'

.bcr/source.template.json

@@ -0,0 +1,5 @@
+{
+  "integrity": "",
+  "strip_prefix": "{REPO}-{VERSION}",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{VERSION}.tar.gz"
+}

.buckconfig

@@ -1,17 +1,30 @@
-[repositories]
-repo = .
+[cells]
+root = .
 prelude = tools/buck/prelude
 toolchains = tools/buck/toolchains
-ovr_config = tools/buck/prelude
-buck = none
+none = none
+
+[external_cells]
+prelude = bundled
+
+[cell_aliases]
+config = prelude
 fbcode = none
 fbsource = none
 
 [project]
 # Hide BUCK files under target/package/ from `buck build ...`. Otherwise:
 #   $ buck build ...
 #   //target/package/cxx-0.3.0/tests:ffi references non-existing file or directory 'target/package/cxx-0.3.0/tests/ffi/lib.rs'
-ignore = target
+#
+# Also hide some Bazel-managed directories that contain symlinks to the repo root.
+ignore = \
+    .git, \
+    bazel-bin, \
+    bazel-cxx, \
+    bazel-out, \
+    bazel-testlogs, \
+    target
 
 [parser]
-target_platform_detector_spec = target://...->ovr_config//platforms:default
+target_platform_detector_spec = target:root//...->prelude//platforms:default

.clang-format

@@ -1,2 +1,3 @@
 AlwaysBreakTemplateDeclarations: true
 MaxEmptyLinesToKeep: 3
+ReflowComments: false

.clang-tidy

@@ -3,16 +3,19 @@ Checks:
   clang-diagnostic-*,
   cppcoreguidelines-*,
   modernize-*,
+  -cppcoreguidelines-avoid-const-or-ref-data-members,
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-owning-memory,
-  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
   -cppcoreguidelines-pro-type-const-cast,
   -cppcoreguidelines-pro-type-member-init,
   -cppcoreguidelines-pro-type-reinterpret-cast,
-  -cppcoreguidelines-pro-type-vararg,
   -cppcoreguidelines-special-member-functions,
-  -modernize-use-default-member-init,
-  -modernize-use-equals-default,
+  -modernize-concat-nested-namespaces,
+  -modernize-return-braced-init-list,
+  -modernize-type-traits,
+  -modernize-use-constraints,
+  -modernize-use-nodiscard,
+  -modernize-use-ranges,
   -modernize-use-trailing-return-type,
 HeaderFilterRegex: cxx\.h

.devcontainer/build.Dockerfile

@@ -1,18 +1,14 @@
-FROM mcr.microsoft.com/vscode/devcontainers/rust:1
+FROM mcr.microsoft.com/devcontainers/rust:bookworm
 
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends openjdk-11-jdk lld \
-    && rustup default nightly 2>&1 \
-    && rustup component add rust-analyzer-preview rustfmt clippy 2>&1 \
-    && wget -q -O bin/install-bazel https://github.com/bazelbuild/bazel/releases/download/4.0.0/bazel-4.0.0-installer-linux-x86_64.sh \
-    && wget -q -O bin/buck https://jitpack.io/com/github/facebook/buck/a5f0342ae3/buck-a5f0342ae3-java11.pex \
-    && wget -q -O bin/buildifier https://github.com/bazelbuild/buildtools/releases/latest/download/buildifier \
-    && wget -q -O tmp/watchman.zip https://github.com/facebook/watchman/releases/download/v2020.09.21.00/watchman-v2020.09.21.00-linux.zip \
-    && chmod +x bin/install-bazel bin/buck bin/buildifier \
-    && bin/install-bazel \
-    && unzip tmp/watchman.zip -d tmp \
-    && mv tmp/watchman-v2020.09.21.00-linux/bin/watchman bin \
-    && mv tmp/watchman-v2020.09.21.00-linux/lib/* /usr/local/lib \
-    && mkdir -p /usr/local/var/run/watchman \
-    && rm tmp/watchman.zip
+    && apt-get -y install --no-install-recommends clang lld zstd \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && wget -q -O /usr/local/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-amd64 \
+    && wget -q -O /tmp/buck.zst https://github.com/facebook/buck2/releases/download/latest/buck2-x86_64-unknown-linux-gnu.zst \
+    && wget -q -O /usr/local/bin/buildifier https://github.com/bazelbuild/buildtools/releases/latest/download/buildifier-linux-amd64 \
+    && unzstd /tmp/buck.zst -o /usr/local/bin/buck \
+    && chmod +x /usr/local/bin/bazel /usr/local/bin/buck /usr/local/bin/buildifier \
+    && rm /tmp/buck.zst \
+    && rustup component add rust-analyzer rust-src

.devcontainer/devcontainer.json

@@ -13,8 +13,8 @@
     },
     "extensions": [
         "BazelBuild.vscode-bazel",
-        "matklad.rust-analyzer",
         "ms-vscode.cpptools",
+        "rust-lang.rust-analyzer",
         "vadimcn.vscode-lldb"
     ]
 }

.gitattributes

@@ -1,2 +1,3 @@
-third-party/BUCK linguist-generated
-third-party/bazel/** linguist-generated
+/MODULE.bazel.lock linguist-generated
+/third-party/BUCK linguist-generated
+/third-party/bazel/** linguist-generated

.github/workflows/buck2.yml

@@ -0,0 +1,30 @@
+name: Buck2
+
+on:
+  push:
+  workflow_dispatch:
+  schedule: [cron: "40 1,13 * * *"]
+
+permissions:
+  contents: read
+
+jobs:
+  buck2:
+    name: Buck2 on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || matrix.os == 'windows' && 'Windows' || '???'}}
+    runs-on: ${{matrix.os}}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, macos, windows]
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rust-src
+      - uses: dtolnay/install-buck2@latest
+      - run: buck2 run demo
+      - run: buck2 build ...
+      - run: buck2 test ...
+      - name: Run buck2 starlark lint
+        run: git ls-files ':(glob)tools/buck/**/*.bzl' | xargs buck2 starlark lint