Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 6244f48

Browse files
committedNov 7, 2024
Auto merge of rust-lang#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 rust-lang#129079 Fixes rust-lang#127890
2 parents a2eaef7 + 75b9ce3 commit 6244f48

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed
 

‎Cargo.lock

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎std/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ unwind = { path = "../unwind" }
2222
hashbrown = { version = "0.15", default-features = false, features = [
2323
'rustc-dep-of-std',
2424
] }
25-
# FIXME(#127890): `object` depends on `memchr`, but `memchr` > v2.5 causes
26-
# issues with LTO. This dependency is not used directly, but pin it here so
27-
# it resolves to 2.5. To be removed once rust-lang/rust#127890 is fixed.
28-
memchr = { version = "=2.5.0", default-features = false, features = ["rustc-dep-of-std"] }
2925
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = [
3026
'rustc-dep-of-std',
3127
] }

0 commit comments

Comments
 (0)
Failed to load comments.