Merge branch 'dtolnay:master' into master

Author: mikea

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cxx"
-version = "1.0.143"
+version = "1.0.145"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::ffi", "api-bindings", "no-std"]
 description = "Safe interop between Rust and C++"
@@ -23,24 +23,24 @@ alloc = []
 std = ["alloc", "foldhash/std"]
 
 [dependencies]
-cxxbridge-macro = { version = "=1.0.143", path = "macro" }
+cxxbridge-macro = { version = "=1.0.145", path = "macro" }
 foldhash = { version = "0.1", default-features = false }
 link-cplusplus = "1.0.9"
 
 [build-dependencies]
 cc = "1.0.83"
-cxxbridge-flags = { version = "=1.0.143", path = "flags", default-features = false }
+cxxbridge-flags = { version = "=1.0.145", path = "flags", default-features = false }
 
 [dev-dependencies]
-cxx-build = { version = "=1.0.143", path = "gen/build" }
+cxx-build = { version = "=1.0.145", path = "gen/build" }
 cxx-gen = { version = "0.7", path = "gen/lib" }
 cxx-test-suite = { version = "0", path = "tests/ffi" }
 rustversion = "1.0.13"
 trybuild = { version = "1.0.81", features = ["diff"] }
 
 # Disallow incompatible cxxbridge-cmd version appearing in the same lockfile.
 [target.'cfg(any())'.build-dependencies]
-cxxbridge-cmd = { version = "=1.0.143", path = "gen/cmd" }
+cxxbridge-cmd = { version = "=1.0.145", path = "gen/cmd" }
 
 [workspace]
 members = ["demo", "flags", "gen/build", "gen/cmd", "gen/lib", "macro", "tests/ffi"]

MODULE.bazel

@@ -1,6 +1,13 @@
-module(name = "cxx.rs")
+module(
+    name = "cxx.rs",
+    version = "1.0.145",
+    bazel_compatibility = [">=7.2.1"],
+    compatibility_level = 1,
+)
 
+bazel_dep(name = "bazel_features", version = "1.21.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "rules_cc", version = "0.1.1")
 bazel_dep(name = "rules_rust", version = "0.58.0")
 
@@ -13,4 +20,8 @@ use_repo(rust, "rust_toolchains")
 register_toolchains("@rust_toolchains//:all")
 
 crate_repositories = use_extension("//tools/bazel:extension.bzl", "crate_repositories")
-use_repo(crate_repositories, "crates.io")
+use_repo(
+    crate_repositories,
+    "crates.io",
+    "vendor",
+)

MODULE.bazel.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cxxbridge-flags"
-version = "1.0.143"
+version = "1.0.145"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::ffi", "compilers"]
 description = "Compiler configuration of the `cxx` crate (implementation detail)"

flags/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cxx-build"
-version = "1.0.143"
+version = "1.0.145"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::build-utils", "development-tools::ffi"]
 description = "C++ code generator for integrating `cxx` crate into a Cargo build."

gen/build/Cargo.toml

@@ -45,7 +45,7 @@
 //! $ cxxbridge src/main.rs > path/to/mybridge.cc
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/cxx-build/1.0.143")]
+#![doc(html_root_url = "https://docs.rs/cxx-build/1.0.145")]
 #![cfg_attr(not(check_cfg), allow(unexpected_cfgs))]
 #![allow(
     clippy::cast_sign_loss,

gen/build/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "cxxbridge-cmd"
-version = "1.0.143"
+version = "1.0.145"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::build-utils", "development-tools::ffi"]
 description = "C++ code generator for integrating `cxx` crate into a non-Cargo build."

gen/cmd/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cxx-gen"
-version = "0.7.143"
+version = "0.7.145"
 authors = ["Adrian Taylor <adetaylor@chromium.org>"]
 categories = ["development-tools::ffi"]
 description = "C++ code generator for integrating `cxx` crate into higher level tools."

gen/lib/Cargo.toml

@@ -7,7 +7,7 @@
 //! [dtolnay/cxx#235]: https://github.com/dtolnay/cxx/issues/235
 //! [https://github.com/google/autocxx]: https://github.com/google/autocxx
 
-#![doc(html_root_url = "https://docs.rs/cxx-gen/0.7.143")]
+#![doc(html_root_url = "https://docs.rs/cxx-gen/0.7.145")]
 #![deny(missing_docs)]
 #![allow(dead_code)]
 #![cfg_attr(not(check_cfg), allow(unexpected_cfgs))]

gen/lib/src/lib.rs

@@ -52,7 +52,7 @@ class String final {
   String(const char *, std::size_t);
   String(const char16_t *);
   String(const char16_t *, std::size_t);
-#if __cplusplus >= 202002L
+#ifdef __cpp_char8_t
   String(const char8_t *s);
   String(const char8_t *s, std::size_t len);
 #endif