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
This commit is contained in:
commit
9a77c3c2cb
@ -167,9 +167,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
version = "2.5.0"
|
version = "2.7.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
|
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"compiler_builtins",
|
"compiler_builtins",
|
||||||
"rustc-std-workspace-core",
|
"rustc-std-workspace-core",
|
||||||
@ -335,7 +335,6 @@ dependencies = [
|
|||||||
"hashbrown",
|
"hashbrown",
|
||||||
"hermit-abi",
|
"hermit-abi",
|
||||||
"libc",
|
"libc",
|
||||||
"memchr",
|
|
||||||
"miniz_oxide",
|
"miniz_oxide",
|
||||||
"object",
|
"object",
|
||||||
"panic_abort",
|
"panic_abort",
|
||||||
|
@ -22,10 +22,6 @@ unwind = { path = "../unwind" }
|
|||||||
hashbrown = { version = "0.15", default-features = false, features = [
|
hashbrown = { version = "0.15", default-features = false, features = [
|
||||||
'rustc-dep-of-std',
|
'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 = [
|
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = [
|
||||||
'rustc-dep-of-std',
|
'rustc-dep-of-std',
|
||||||
] }
|
] }
|
||||||
|
Loading…
Reference in New Issue
Block a user