Skip to content

Commit 737421a

Browse files
committed
Rustup to rustc 1.79.0-nightly (385fa9d 2024-04-04)
1 parent 5a9940f commit 737421a

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

build_system/prepare.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ pub(crate) fn prepare(dirs: &Dirs) {
1515
RelPath::DOWNLOAD.ensure_exists(dirs);
1616
crate::tests::RAND_REPO.fetch(dirs);
1717
crate::tests::REGEX_REPO.fetch(dirs);
18-
crate::tests::PORTABLE_SIMD_REPO.fetch(dirs);
1918
}
2019

2120
pub(crate) fn prepare_stdlib(dirs: &Dirs, rustc: &Path) {

build_system/tests.rs

+8-9
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,10 @@ pub(crate) static REGEX_REPO: GitRepo = GitRepo::github(
130130

131131
pub(crate) static REGEX: CargoProject = CargoProject::new(&REGEX_REPO.source_dir(), "regex_target");
132132

133-
pub(crate) static PORTABLE_SIMD_REPO: GitRepo = GitRepo::github(
134-
"rust-lang",
135-
"portable-simd",
136-
"5794c837bc605c4cd9dbb884285976dfdb293cce",
137-
"a64d8fdd0ed0d9c4",
138-
"portable-simd",
139-
);
133+
pub(crate) static PORTABLE_SIMD_SRC: RelPath = RelPath::BUILD.join("coretests");
140134

141135
pub(crate) static PORTABLE_SIMD: CargoProject =
142-
CargoProject::new(&PORTABLE_SIMD_REPO.source_dir(), "portable-simd_target");
136+
CargoProject::new(&PORTABLE_SIMD_SRC, "portable-simd_target");
143137

144138
static LIBCORE_TESTS_SRC: RelPath = RelPath::BUILD.join("coretests");
145139

@@ -221,7 +215,12 @@ const EXTENDED_SYSROOT_SUITE: &[TestCase] = &[
221215
}
222216
}),
223217
TestCase::custom("test.portable-simd", &|runner| {
224-
PORTABLE_SIMD_REPO.patch(&runner.dirs);
218+
apply_patches(
219+
&runner.dirs,
220+
"portable-simd",
221+
&runner.stdlib_source.join("library/portable-simd"),
222+
&PORTABLE_SIMD_SRC.to_path(&runner.dirs),
223+
);
225224

226225
PORTABLE_SIMD.clean(&runner.dirs);
227226

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2024-03-30"
2+
channel = "nightly-2024-04-05"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]

0 commit comments

Comments
 (0)