diff options
| author | bors <bors@rust-lang.org> | 2024-11-07 15:34:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-07 15:34:14 +0000 |
| commit | 9a77c3c2cb067ecb7c7ddda3c12aefb521776207 (patch) | |
| tree | bdfada1766fd8b81a92e50171a47ee137ccc0912 | |
| parent | 3d1dba830a564d1118361345d7ada47a05241f45 (diff) | |
| parent | 7cdbb59c26e4217ad94e8454403e98d00a66ddd9 (diff) | |
| download | rust-9a77c3c2cb067ecb7c7ddda3c12aefb521776207.tar.gz rust-9a77c3c2cb067ecb7c7ddda3c12aefb521776207.zip | |
Auto merge of #132714 - mati865:update-memchr, r=tgross35
unpin and update memchr I'm unable to build x86_64-pc-windows-gnu Rust due to some weird binutils bug, but thinlto issue seems to be no longer present. Let's give it a go on the CI. Possibly fixed by https://github.com/rust-lang/rust/pull/129079 Fixes #127890
| -rw-r--r-- | library/Cargo.lock | 5 | ||||
| -rw-r--r-- | library/std/Cargo.toml | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/library/Cargo.lock b/library/Cargo.lock index 18c131a6eed..772f9b19695 100644 --- a/library/Cargo.lock +++ b/library/Cargo.lock @@ -167,9 +167,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" dependencies = [ "compiler_builtins", "rustc-std-workspace-core", @@ -335,7 +335,6 @@ dependencies = [ "hashbrown", "hermit-abi", "libc", - "memchr", "miniz_oxide", "object", "panic_abort", diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 23ef172b6f0..b732fdf1696 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -22,10 +22,6 @@ unwind = { path = "../unwind" } hashbrown = { version = "0.15", default-features = false, features = [ 'rustc-dep-of-std', ] } -# FIXME(#127890): `object` depends on `memchr`, but `memchr` > v2.5 causes -# issues with LTO. This dependency is not used directly, but pin it here so -# it resolves to 2.5. To be removed once rust-lang/rust#127890 is fixed. -memchr = { version = "=2.5.0", default-features = false, features = ["rustc-dep-of-std"] } std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = [ 'rustc-dep-of-std', ] } |