File tree 6 files changed +25
-14
lines changed
6 files changed +25
-14
lines changed Original file line number Diff line number Diff line change @@ -607,10 +607,13 @@ jobs:
607
607
strategy :
608
608
matrix :
609
609
include :
610
- - name : dist- x86_64-linux
610
+ - name : x86_64-mingw
611
611
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
614
617
defaults :
615
618
run :
616
619
shell : " ${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
Original file line number Diff line number Diff line change @@ -2372,9 +2372,8 @@ dependencies = [
2372
2372
2373
2373
[[package ]]
2374
2374
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"
2378
2377
dependencies = [
2379
2378
" compiler_builtins" ,
2380
2379
" rustc-std-workspace-core" ,
Original file line number Diff line number Diff line change @@ -118,6 +118,7 @@ strip = true
118
118
rustc-std-workspace-core = { path = ' library/rustc-std-workspace-core' }
119
119
rustc-std-workspace-alloc = { path = ' library/rustc-std-workspace-alloc' }
120
120
rustc-std-workspace-std = { path = ' library/rustc-std-workspace-std' }
121
+ memchr = { git = " https://github.com/flip1995/memchr.git" }
121
122
122
123
[patch ."https://github .com/rust-lang/rust-clippy" ]
123
124
clippy_lints = { path = " src/tools/clippy/clippy_lints" }
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ edition = "2021"
7
7
# FIXME: bumping memchr to 2.7.1 causes linker errors in MSVC thin-lto
8
8
# tidy-alphabetical-start
9
9
bitflags = " 2.4.1"
10
- memchr = " =2.5 .0"
10
+ memchr = " 2.6 .0"
11
11
rustc_data_structures = { path = " ../rustc_data_structures" }
12
12
rustc_index = { path = " ../rustc_index" }
13
13
rustc_lexer = { path = " ../rustc_lexer" }
Original file line number Diff line number Diff line change @@ -755,13 +755,18 @@ jobs:
755
755
strategy :
756
756
matrix :
757
757
include :
758
- - &dist- x86_64-linux
759
- name : dist- x86_64-linux
758
+ - &x86_64-mingw
759
+ name : x86_64-mingw
760
760
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
765
770
master :
766
771
name : master
767
772
runs-on : ubuntu-latest
Original file line number Diff line number Diff line change @@ -4,7 +4,10 @@ use std::fs;
4
4
use std:: path:: Path ;
5
5
6
6
/// 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
+ ] ;
8
11
9
12
/// Checks for external package sources. `root` is the path to the directory that contains the
10
13
/// workspace `Cargo.toml`.
You can’t perform that action at this time.
0 commit comments