Skip to content

Commit e3ea0db

Browse files
committed
Use non-inline on windows memchr version
1 parent ad75ebb commit e3ea0db

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

Cargo.lock

+20-15
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ version = "1.1.2"
5353
source = "registry+https://github.com/rust-lang/crates.io-index"
5454
checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
5555
dependencies = [
56-
"memchr",
56+
"memchr 2.6.0",
5757
]
5858

5959
[[package]]
@@ -338,7 +338,7 @@ version = "1.6.0"
338338
source = "registry+https://github.com/rust-lang/crates.io-index"
339339
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
340340
dependencies = [
341-
"memchr",
341+
"memchr 2.6.0",
342342
"regex-automata 0.3.7",
343343
"serde",
344344
]
@@ -1514,7 +1514,7 @@ dependencies = [
15141514
"futures-macro",
15151515
"futures-sink",
15161516
"futures-task",
1517-
"memchr",
1517+
"memchr 2.6.0",
15181518
"pin-project-lite",
15191519
"pin-utils",
15201520
"slab",
@@ -1944,7 +1944,7 @@ dependencies = [
19441944
"globset",
19451945
"lazy_static",
19461946
"log",
1947-
"memchr",
1947+
"memchr 2.6.0",
19481948
"regex",
19491949
"same-file",
19501950
"thread_local",
@@ -2343,7 +2343,7 @@ dependencies = [
23432343
"env_logger",
23442344
"handlebars",
23452345
"log",
2346-
"memchr",
2346+
"memchr 2.6.0",
23472347
"once_cell",
23482348
"opener",
23492349
"pulldown-cmark 0.10.0",
@@ -2380,6 +2380,11 @@ dependencies = [
23802380
"rustc-std-workspace-core",
23812381
]
23822382

2383+
[[package]]
2384+
name = "memchr"
2385+
version = "2.7.1"
2386+
source = "git+https://github.com/flip1995/memchr.git#d7eb96b8a8a7bae925b86d4df1c852af6721e806"
2387+
23832388
[[package]]
23842389
name = "memmap2"
23852390
version = "0.2.3"
@@ -2524,7 +2529,7 @@ version = "7.1.3"
25242529
source = "registry+https://github.com/rust-lang/crates.io-index"
25252530
checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
25262531
dependencies = [
2527-
"memchr",
2532+
"memchr 2.6.0",
25282533
"minimal-lexical",
25292534
]
25302535

@@ -2599,7 +2604,7 @@ dependencies = [
25992604
"flate2",
26002605
"hashbrown",
26012606
"indexmap",
2602-
"memchr",
2607+
"memchr 2.6.0",
26032608
"rustc-std-workspace-alloc",
26042609
"rustc-std-workspace-core",
26052610
"ruzstd",
@@ -2823,7 +2828,7 @@ version = "2.7.7"
28232828
source = "registry+https://github.com/rust-lang/crates.io-index"
28242829
checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546"
28252830
dependencies = [
2826-
"memchr",
2831+
"memchr 2.6.0",
28272832
"thiserror",
28282833
"ucd-trie",
28292834
]
@@ -3011,7 +3016,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
30113016
checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
30123017
dependencies = [
30133018
"bitflags 2.4.2",
3014-
"memchr",
3019+
"memchr 2.6.0",
30153020
"unicase",
30163021
]
30173022

@@ -3022,7 +3027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
30223027
checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7"
30233028
dependencies = [
30243029
"bitflags 2.4.2",
3025-
"memchr",
3030+
"memchr 2.6.0",
30263031
"pulldown-cmark-escape",
30273032
"unicase",
30283033
]
@@ -3170,7 +3175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31703175
checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
31713176
dependencies = [
31723177
"aho-corasick",
3173-
"memchr",
3178+
"memchr 2.6.0",
31743179
"regex-automata 0.3.7",
31753180
"regex-syntax 0.7.5",
31763181
]
@@ -3190,7 +3195,7 @@ version = "0.2.0"
31903195
source = "registry+https://github.com/rust-lang/crates.io-index"
31913196
checksum = "e9368763f5a9b804326f3af749e16f9abf378d227bcdee7634b13d8f17793782"
31923197
dependencies = [
3193-
"memchr",
3198+
"memchr 2.6.0",
31943199
]
31953200

31963201
[[package]]
@@ -3200,7 +3205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32003205
checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
32013206
dependencies = [
32023207
"aho-corasick",
3203-
"memchr",
3208+
"memchr 2.6.0",
32043209
"regex-syntax 0.7.5",
32053210
]
32063211

@@ -3431,7 +3436,7 @@ name = "rustc_ast"
34313436
version = "0.0.0"
34323437
dependencies = [
34333438
"bitflags 2.4.2",
3434-
"memchr",
3439+
"memchr 2.7.1",
34353440
"rustc_data_structures",
34363441
"rustc_index",
34373442
"rustc_lexer",
@@ -6332,7 +6337,7 @@ version = "0.5.40"
63326337
source = "registry+https://github.com/rust-lang/crates.io-index"
63336338
checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
63346339
dependencies = [
6335-
"memchr",
6340+
"memchr 2.6.0",
63366341
]
63376342

63386343
[[package]]

compiler/rustc_ast/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
# FIXME: bumping memchr to 2.7.1 causes linker errors in MSVC thin-lto
88
# tidy-alphabetical-start
99
bitflags = "2.4.1"
10-
memchr = "=2.6.0"
10+
memchr = { git = "https://github.com/flip1995/memchr.git" }
1111
rustc_data_structures = { path = "../rustc_data_structures" }
1212
rustc_index = { path = "../rustc_index" }
1313
rustc_lexer = { path = "../rustc_lexer" }

src/tools/tidy/src/extdeps.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use std::fs;
44
use std::path::Path;
55

66
/// List of allowed sources for packages.
7-
const ALLOWED_SOURCES: &[&str] = &["\"registry+https://github.com/rust-lang/crates.io-index\""];
7+
const ALLOWED_SOURCES: &[&str] = &[
8+
"\"registry+https://github.com/rust-lang/crates.io-index\"",
9+
"\"git+https://github.com/flip1995/memchr.git#d7eb96b8a8a7bae925b86d4df1c852af6721e806\"",
10+
];
811

912
/// Checks for external package sources. `root` is the path to the directory that contains the
1013
/// workspace `Cargo.toml`.

0 commit comments

Comments
 (0)