Merge pull request #1401 from dtolnay/foldhash

Switch C++ std::hash<T> implementations to foldhash

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.82.0, 1.74.0, 1.71.0]
+        rust: [nightly, beta, stable, 1.82.0, 1.74.0, 1.73.0]
         os: [ubuntu]
         include:
           - name: Cargo on macOS
@@ -53,7 +53,7 @@ jobs:
         # builds.
         run: |
           echo RUSTFLAGS=$RUSTFLAGS >> $GITHUB_ENV
-          echo exclude=--exclude cxx-test-suite ${{matrix.rust == '1.71.0' && '--exclude cxxbridge-cmd' || ''}} >> $GITHUB_OUTPUT
+          echo exclude=--exclude cxx-test-suite ${{matrix.rust == '1.73.0' && '--exclude cxxbridge-cmd' || ''}} >> $GITHUB_OUTPUT
         env:
           RUSTFLAGS: ${{env.RUSTFLAGS}} ${{matrix.os != 'ubuntu' && github.event_name != 'schedule' && '--cfg skip_ui_tests' || ''}}
         id: testsuite

BUCK

@@ -13,6 +13,7 @@ rust_library(
     deps = [
         ":core",
         ":cxxbridge-macro",
+        "//third-party:foldhash",
     ],
 )
 

BUILD.bazel

@@ -13,7 +13,10 @@ rust_library(
         ":cxxbridge-macro",
     ],
     visibility = ["//visibility:public"],
-    deps = [":core-lib"],
+    deps = [
+        ":core-lib",
+        "@crates.io//:foldhash",
+    ],
 )
 
 alias(

Cargo.toml

@@ -12,18 +12,19 @@ keywords = ["ffi", "c++"]
 license = "MIT OR Apache-2.0"
 links = "cxxbridge1"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [features]
 default = ["std", "cxxbridge-flags/default"] # c++11
 "c++14" = ["cxxbridge-flags/c++14"]
 "c++17" = ["cxxbridge-flags/c++17"]
 "c++20" = ["cxxbridge-flags/c++20"]
 alloc = []
-std = ["alloc"]
+std = ["alloc", "foldhash/std"]
 
 [dependencies]
 cxxbridge-macro = { version = "=1.0.130", path = "macro" }
+foldhash = { version = "0.1", default-features = false }
 link-cplusplus = "1.0.9"
 
 [build-dependencies]

README.md

@@ -24,7 +24,7 @@ cxx = "1.0"
 cxx-build = "1.0"
 ```
 
-*Compiler support: requires rustc 1.71+ and c++11 or newer*<br>
+*Compiler support: requires rustc 1.73+ and c++11 or newer*<br>
 *[Release notes](https://github.com/dtolnay/cxx/releases)*
 
 <br>

build.rs

@@ -36,8 +36,8 @@ fn main() {
             println!("cargo:rustc-check-cfg=cfg(skip_ui_tests)");
         }
 
-        if rustc.minor < 71 {
-            println!("cargo:warning=The cxx crate requires a rustc version 1.71.0 or newer.");
+        if rustc.minor < 73 {
+            println!("cargo:warning=The cxx crate requires a rustc version 1.73.0 or newer.");
             println!(
                 "cargo:warning=You appear to be building with: {}",
                 rustc.version,

flags/Cargo.toml

@@ -7,7 +7,7 @@ description = "Compiler configuration of the `cxx` crate (implementation detail)
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [features]
 default = [] # c++11

gen/build/Cargo.toml

@@ -11,7 +11,7 @@ homepage = "https://cxx.rs"
 keywords = ["ffi", "build-dependencies"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [features]
 parallel = ["cc/parallel"]

gen/cmd/Cargo.toml

@@ -10,7 +10,7 @@ homepage = "https://cxx.rs"
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [[bin]]
 name = "cxxbridge"

gen/lib/Cargo.toml

@@ -10,7 +10,7 @@ exclude = ["build.rs"]
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [dependencies]
 codespan-reporting = "0.11.1"

macro/Cargo.toml

@@ -10,7 +10,7 @@ homepage = "https://cxx.rs"
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.71"
+rust-version = "1.73"
 
 [lib]
 proc-macro = true

src/hash.rs

@@ -1,12 +1,6 @@
-use core::hash::{Hash, Hasher};
+use core::hash::{BuildHasher as _, Hash};
 
 #[doc(hidden)]
 pub fn hash<V: Hash>(value: &V) -> usize {
-    #[cfg(feature = "std")]
-    let mut hasher = std::collections::hash_map::DefaultHasher::new();
-    #[cfg(not(feature = "std"))]
-    let mut hasher = crate::sip::SipHasher13::new();
-
-    Hash::hash(value, &mut hasher);
-    Hasher::finish(&hasher) as usize
+    foldhash::quality::FixedState::default().hash_one(value) as usize
 }

src/lib.rs

@@ -18,7 +18,7 @@
 //!
 //! <br>
 //!
-//! *Compiler support: requires rustc 1.71+ and c++11 or newer*<br>
+//! *Compiler support: requires rustc 1.73+ and c++11 or newer*<br>
 //! *[Release notes](https://github.com/dtolnay/cxx/releases)*
 //!
 //! <br>
@@ -466,7 +466,6 @@ mod rust_string;
 mod rust_type;
 mod rust_vec;
 mod shared_ptr;
-mod sip;
 #[path = "cxx_string.rs"]
 mod string;
 mod symbols;