Skip to content

Commit 72e5ada

Browse files
committed
Auto merge of #121671 - flip1995:memchr-no-inline-bump, r=<try>
DNM: Try using memchr without inlining on windows Another attempt at #121465, trying to fix the issue on windows to unblock the Clippy sync. (Does specifying a git dependency even work or will the `tidy` tool complain? 🤔) [memchr patch](BurntSushi/memchr@master...flip1995:memchr:master) r? `@ghost`
2 parents b6e4299 + 7dc5996 commit 72e5ada

File tree

6 files changed

+25
-14
lines changed

6 files changed

+25
-14
lines changed

.github/workflows/ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -607,10 +607,13 @@ jobs:
607607
strategy:
608608
matrix:
609609
include:
610-
- name: dist-x86_64-linux
610+
- name: x86_64-mingw
611611
env:
612-
CODEGEN_BACKENDS: "llvm,cranelift"
613-
os: ubuntu-20.04-16core-64gb
612+
SCRIPT: make ci-mingw
613+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-gnu --enable-profiler"
614+
NO_DOWNLOAD_CI_LLVM: 1
615+
CUSTOM_MINGW: 1
616+
os: windows-2019-8core-32gb
614617
defaults:
615618
run:
616619
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

Cargo.lock

+2-3
Original file line numberDiff line numberDiff line change
@@ -2372,9 +2372,8 @@ dependencies = [
23722372

23732373
[[package]]
23742374
name = "memchr"
2375-
version = "2.5.0"
2376-
source = "registry+https://github.com/rust-lang/crates.io-index"
2377-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
2375+
version = "2.6.0"
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.5.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/ci/github-actions/ci.yml

+11-6
Original file line numberDiff line numberDiff line change
@@ -755,13 +755,18 @@ jobs:
755755
strategy:
756756
matrix:
757757
include:
758-
- &dist-x86_64-linux
759-
name: dist-x86_64-linux
758+
- &x86_64-mingw
759+
name: x86_64-mingw
760760
env:
761-
CODEGEN_BACKENDS: llvm,cranelift
762-
<<: *job-linux-16c
763-
764-
761+
SCRIPT: make ci-mingw
762+
RUST_CONFIGURE_ARGS: >-
763+
--build=x86_64-pc-windows-gnu
764+
--enable-profiler
765+
# We are intentionally allowing an old toolchain on this builder (and that's
766+
# incompatible with LLVM downloads today).
767+
NO_DOWNLOAD_CI_LLVM: 1
768+
CUSTOM_MINGW: 1
769+
<<: *job-windows-8c
765770
master:
766771
name: master
767772
runs-on: ubuntu-latest

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)