Skip to content

Commit 7dc5996

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

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Cargo.lock

+1-2
Original file line numberDiff line numberDiff line change
@@ -2373,8 +2373,7 @@ dependencies = [
23732373
[[package]]
23742374
name = "memchr"
23752375
version = "2.6.0"
2376-
source = "registry+https://github.com/rust-lang/crates.io-index"
2377-
checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c"
2376+
source = "git+https://github.com/flip1995/memchr.git#f2e2936815bf211ece60a0251b53a617e1d678ac"
23782377
dependencies = [
23792378
"compiler_builtins",
23802379
"rustc-std-workspace-core",

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ strip = true
118118
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
119119
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
120120
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
121+
memchr = { git = "https://github.com/flip1995/memchr.git" }
121122

122123
[patch."https://github.com/rust-lang/rust-clippy"]
123124
clippy_lints = { path = "src/tools/clippy/clippy_lints" }

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 = "2.6.0"
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#f2e2936815bf211ece60a0251b53a617e1d678ac\"",
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)