From 7cdbb59c26e4217ad94e8454403e98d00a66ddd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
Date: Thu, 7 Nov 2024 02:04:47 +0100
Subject: [PATCH] unpin and update memchr
---
library/Cargo.lock | 5 ++---
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',
] }