Skip to content

Commit 07c6913

Browse files
borsbors
committed
Auto merge of rust-lang#128024 - matthiaskrgr:rollup-3n1bufb, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#126450 (Promote Mac Catalyst targets to Tier 2, and ship with rustup) - rust-lang#127177 (Distribute rustc_codegen_cranelift for arm64 macOS) - rust-lang#127510 (Rewrite `test-float-parse` in Rust) - rust-lang#127977 (Update wasi-sdk in CI to latest release) - rust-lang#127985 (Migrate `test-benches`, `c-unwind-abi-catch-panic` and `compiler-lookup-paths-2` `run-make` tests to rmake) - rust-lang#128023 (rustdoc: short descriptions cause word-breaks in tables) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a62ac15 + 4fca8db commit 07c6913

File tree

54 files changed

+2600
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+2600
-603
lines changed

‎Cargo.lock

+75
Original file line numberDiff line numberDiff line change
@@ -2598,12 +2598,76 @@ dependencies = [
25982598
"windows-sys 0.48.0",
25992599
]
26002600

2601+
[[package]]
2602+
name = "num"
2603+
version = "0.4.3"
2604+
source = "registry+https://github.com/rust-lang/crates.io-index"
2605+
checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
2606+
dependencies = [
2607+
"num-bigint",
2608+
"num-complex",
2609+
"num-integer",
2610+
"num-iter",
2611+
"num-rational",
2612+
"num-traits",
2613+
]
2614+
2615+
[[package]]
2616+
name = "num-bigint"
2617+
version = "0.4.6"
2618+
source = "registry+https://github.com/rust-lang/crates.io-index"
2619+
checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
2620+
dependencies = [
2621+
"num-integer",
2622+
"num-traits",
2623+
]
2624+
2625+
[[package]]
2626+
name = "num-complex"
2627+
version = "0.4.6"
2628+
source = "registry+https://github.com/rust-lang/crates.io-index"
2629+
checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
2630+
dependencies = [
2631+
"num-traits",
2632+
]
2633+
26012634
[[package]]
26022635
name = "num-conv"
26032636
version = "0.1.0"
26042637
source = "registry+https://github.com/rust-lang/crates.io-index"
26052638
checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
26062639

2640+
[[package]]
2641+
name = "num-integer"
2642+
version = "0.1.46"
2643+
source = "registry+https://github.com/rust-lang/crates.io-index"
2644+
checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
2645+
dependencies = [
2646+
"num-traits",
2647+
]
2648+
2649+
[[package]]
2650+
name = "num-iter"
2651+
version = "0.1.45"
2652+
source = "registry+https://github.com/rust-lang/crates.io-index"
2653+
checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
2654+
dependencies = [
2655+
"autocfg",
2656+
"num-integer",
2657+
"num-traits",
2658+
]
2659+
2660+
[[package]]
2661+
name = "num-rational"
2662+
version = "0.4.2"
2663+
source = "registry+https://github.com/rust-lang/crates.io-index"
2664+
checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
2665+
dependencies = [
2666+
"num-bigint",
2667+
"num-integer",
2668+
"num-traits",
2669+
]
2670+
26072671
[[package]]
26082672
name = "num-traits"
26092673
version = "0.2.19"
@@ -5630,6 +5694,17 @@ dependencies = [
56305694
"std",
56315695
]
56325696

5697+
[[package]]
5698+
name = "test-float-parse"
5699+
version = "0.1.0"
5700+
dependencies = [
5701+
"indicatif",
5702+
"num",
5703+
"rand",
5704+
"rand_chacha",
5705+
"rayon",
5706+
]
5707+
56335708
[[package]]
56345709
name = "textwrap"
56355710
version = "0.16.1"

‎Cargo.toml

+13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ members = [
44
"compiler/rustc",
55
"library/std",
66
"library/sysroot",
7+
"src/etc/test-float-parse",
78
"src/rustdoc-json-types",
89
"src/tools/build_helper",
910
"src/tools/cargotest",
@@ -109,6 +110,18 @@ strip = true
109110
debug = 0
110111
strip = true
111112

113+
# Bigint libraries are slow without optimization, speed up testing
114+
[profile.dev.package.test-float-parse]
115+
opt-level = 3
116+
117+
# Speed up the binary as much as possible
118+
[profile.release.package.test-float-parse]
119+
opt-level = 3
120+
codegen-units = 1
121+
# FIXME: LTO cannot be enabled for binaries in a workspace
122+
# <https://github.com/rust-lang/cargo/issues/9330>
123+
# lto = true
124+
112125
[patch.crates-io]
113126
# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
114127
# here

‎compiler/rustc_codegen_cranelift/Readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ For more docs on how to build and test see [build_system/usage.txt](build_system
7070
|FreeBSD|✅[^no-rustup]|❓|❓|❓|
7171
|AIX|❌[^xcoff]|N/A|N/A|❌[^xcoff]|
7272
|Other unixes|❓|❓|❓|❓|
73-
|macOS|✅|✅[^no-rustup]|N/A|N/A|
73+
|macOS|✅|✅|N/A|N/A|
7474
|Windows|✅[^no-rustup]|❌|N/A|N/A|
7575

7676
✅: Fully supported and tested

‎src/bootstrap/mk/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ check-aux:
5151
$(Q)$(BOOTSTRAP) test --stage 2 \
5252
src/tools/cargo \
5353
src/tools/cargotest \
54+
etc/etc/test-float-parse \
5455
$(BOOTSTRAP_ARGS)
5556
# Run standard library tests in Miri.
5657
$(Q)BOOTSTRAP_SKIP_TARGET_SANITY=1 \

‎src/bootstrap/src/core/build_steps/check.rs

+1
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@ tool_check_step!(CargoMiri, "src/tools/miri/cargo-miri", SourceType::InTree);
466466
tool_check_step!(Rls, "src/tools/rls", SourceType::InTree);
467467
tool_check_step!(Rustfmt, "src/tools/rustfmt", SourceType::InTree);
468468
tool_check_step!(MiroptTestTools, "src/tools/miropt-test-tools", SourceType::InTree);
469+
tool_check_step!(TestFloatParse, "src/etc/test-float-parse", SourceType::InTree);
469470

470471
tool_check_step!(Bootstrap, "src/bootstrap", SourceType::InTree, false);
471472

‎src/bootstrap/src/core/build_steps/clippy.rs

+1
Original file line numberDiff line numberDiff line change
@@ -326,4 +326,5 @@ lint_any!(
326326
Rustfmt, "src/tools/rustfmt", "rustfmt";
327327
RustInstaller, "src/tools/rust-installer", "rust-installer";
328328
Tidy, "src/tools/tidy", "tidy";
329+
TestFloatParse, "src/etc/test-float-parse", "test-float-parse";
329330
);

‎src/bootstrap/src/core/build_steps/test.rs

+77
Original file line numberDiff line numberDiff line change
@@ -3505,3 +3505,80 @@ impl Step for CodegenGCC {
35053505
cargo.into_cmd().run(builder);
35063506
}
35073507
}
3508+
3509+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
3510+
pub struct TestFloatParse {
3511+
path: PathBuf,
3512+
host: TargetSelection,
3513+
}
3514+
3515+
impl Step for TestFloatParse {
3516+
type Output = ();
3517+
const ONLY_HOSTS: bool = true;
3518+
const DEFAULT: bool = true;
3519+
3520+
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
3521+
run.path("src/etc/test-float-parse")
3522+
}
3523+
3524+
fn make_run(run: RunConfig<'_>) {
3525+
for path in run.paths {
3526+
let path = path.assert_single_path().path.clone();
3527+
run.builder.ensure(Self { path, host: run.target });
3528+
}
3529+
}
3530+
3531+
fn run(self, builder: &Builder<'_>) {
3532+
let bootstrap_host = builder.config.build;
3533+
let compiler = builder.compiler(0, bootstrap_host);
3534+
let path = self.path.to_str().unwrap();
3535+
let crate_name = self.path.components().last().unwrap().as_os_str().to_str().unwrap();
3536+
3537+
builder.ensure(compile::Std::new(compiler, self.host));
3538+
3539+
// Run any unit tests in the crate
3540+
let cargo_test = tool::prepare_tool_cargo(
3541+
builder,
3542+
compiler,
3543+
Mode::ToolStd,
3544+
bootstrap_host,
3545+
"test",
3546+
path,
3547+
SourceType::InTree,
3548+
&[],
3549+
);
3550+
3551+
run_cargo_test(
3552+
cargo_test,
3553+
&[],
3554+
&[],
3555+
crate_name,
3556+
crate_name,
3557+
compiler,
3558+
bootstrap_host,
3559+
builder,
3560+
);
3561+
3562+
// Run the actual parse tests.
3563+
let mut cargo_run = tool::prepare_tool_cargo(
3564+
builder,
3565+
compiler,
3566+
Mode::ToolStd,
3567+
bootstrap_host,
3568+
"run",
3569+
path,
3570+
SourceType::InTree,
3571+
&[],
3572+
);
3573+
3574+
cargo_run.arg("--");
3575+
if builder.config.args().is_empty() {
3576+
// By default, exclude tests that take longer than ~1m.
3577+
cargo_run.arg("--skip-huge");
3578+
} else {
3579+
cargo_run.args(builder.config.args());
3580+
}
3581+
3582+
cargo_run.into_cmd().run(builder);
3583+
}
3584+
}

‎src/bootstrap/src/core/builder.rs

+3
Original file line numberDiff line numberDiff line change
@@ -826,6 +826,7 @@ impl<'a> Builder<'a> {
826826
clippy::Rustdoc,
827827
clippy::Rustfmt,
828828
clippy::RustInstaller,
829+
clippy::TestFloatParse,
829830
clippy::Tidy,
830831
),
831832
Kind::Check | Kind::Fix => describe!(
@@ -840,6 +841,7 @@ impl<'a> Builder<'a> {
840841
check::Rls,
841842
check::Rustfmt,
842843
check::RustAnalyzer,
844+
check::TestFloatParse,
843845
check::Bootstrap,
844846
),
845847
Kind::Test => describe!(
@@ -901,6 +903,7 @@ impl<'a> Builder<'a> {
901903
test::RustdocJson,
902904
test::HtmlCheck,
903905
test::RustInstaller,
906+
test::TestFloatParse,
904907
// Run bootstrap close to the end as it's unlikely to fail
905908
test::Bootstrap,
906909
// Run run-make last, since these won't pass without make on Windows

‎src/bootstrap/src/utils/helpers.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,9 @@ pub fn target_supports_cranelift_backend(target: TargetSelection) -> bool {
203203
|| target.contains("aarch64")
204204
|| target.contains("s390x")
205205
|| target.contains("riscv64gc")
206-
} else if target.contains("darwin") || target.is_windows() {
206+
} else if target.contains("darwin") {
207+
target.contains("x86_64") || target.contains("aarch64")
208+
} else if target.is_windows() {
207209
target.contains("x86_64")
208210
} else {
209211
false

‎src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc sun
8585
COPY host-x86_64/dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
8686
RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh
8787

88-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | \
88+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz | \
8989
tar -xz
90-
ENV WASI_SDK_PATH=/tmp/wasi-sdk-22.0
90+
ENV WASI_SDK_PATH=/tmp/wasi-sdk-23.0-x86_64-linux
9191

9292
COPY scripts/freebsd-toolchain.sh /tmp/
9393
RUN /tmp/freebsd-toolchain.sh i686

‎src/ci/docker/host-x86_64/test-various/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ WORKDIR /
4040
COPY scripts/sccache.sh /scripts/
4141
RUN sh /scripts/sccache.sh
4242

43-
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | \
43+
RUN curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-23/wasi-sdk-23.0-x86_64-linux.tar.gz | \
4444
tar -xz
45-
ENV WASI_SDK_PATH=/wasi-sdk-22.0
45+
ENV WASI_SDK_PATH=/wasi-sdk-23.0-x86_64-linux
4646

4747
ENV RUST_CONFIGURE_ARGS \
4848
--musl-root-x86_64=/usr/local/x86_64-linux-musl \

‎src/ci/github-actions/jobs.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ auto:
285285

286286
- image: dist-apple-various
287287
env:
288-
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim
288+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim,aarch64-apple-ios-macabi,x86_64-apple-ios-macabi
289289
RUST_CONFIGURE_ARGS: --enable-sanitizers --enable-profiler --set rust.jemalloc
290290
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
291291
MACOSX_DEPLOYMENT_TARGET: 10.12
@@ -326,6 +326,7 @@ auto:
326326
NO_DEBUG_ASSERTIONS: 1
327327
NO_OVERFLOW_CHECKS: 1
328328
DIST_REQUIRE_ALL_TOOLS: 1
329+
CODEGEN_BACKENDS: llvm,cranelift
329330
<<: *job-macos-m1
330331

331332
# This target only needs to support 11.0 and up as nothing else supports the hardware

‎src/doc/rustc/src/platform-support.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ so Rustup may install the documentation for a similar tier 1 target instead.
135135
target | std | notes
136136
-------|:---:|-------
137137
[`aarch64-apple-ios`](platform-support/apple-ios.md) | ✓ | ARM64 iOS
138+
[`aarch64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | Mac Catalyst on ARM64
138139
[`aarch64-apple-ios-sim`](platform-support/apple-ios.md) | ✓ | Apple iOS Simulator on ARM64
139140
`aarch64-fuchsia` | ✓ | Alias for `aarch64-unknown-fuchsia`
140141
[`aarch64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | ARM64 Fuchsia
@@ -195,6 +196,7 @@ target | std | notes
195196
[`wasm32-wasip1`](platform-support/wasm32-wasip1.md) | ✓ | WebAssembly with WASI
196197
[`wasm32-wasip1-threads`](platform-support/wasm32-wasip1-threads.md) | ✓ | WebAssembly with WASI Preview 1 and threads
197198
[`x86_64-apple-ios`](platform-support/apple-ios.md) | ✓ | 64-bit x86 iOS
199+
[`x86_64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | Mac Catalyst on x86_64
198200
[`x86_64-fortanix-unknown-sgx`](platform-support/x86_64-fortanix-unknown-sgx.md) | ✓ | [Fortanix ABI] for 64-bit Intel SGX
199201
`x86_64-fuchsia` | ✓ | Alias for `x86_64-unknown-fuchsia`
200202
[`x86_64-unknown-fuchsia`](platform-support/fuchsia.md) | ✓ | 64-bit x86 Fuchsia
@@ -244,7 +246,6 @@ target | std | host | notes
244246
-------|:---:|:----:|-------
245247
[`arm64e-apple-ios`](platform-support/arm64e-apple-ios.md) | ✓ | | ARM64e Apple iOS
246248
[`arm64e-apple-darwin`](platform-support/arm64e-apple-darwin.md) | ✓ | ✓ | ARM64e Apple Darwin
247-
[`aarch64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | | Apple Catalyst on ARM64
248249
[`aarch64-apple-tvos`](platform-support/apple-tvos.md) | ✓ | | ARM64 tvOS
249250
[`aarch64-apple-tvos-sim`](platform-support/apple-tvos.md) | ✓ | | ARM64 tvOS Simulator
250251
[`aarch64-apple-watchos`](platform-support/apple-watchos.md) | ✓ | | ARM64 Apple WatchOS
@@ -370,7 +371,6 @@ target | std | host | notes
370371
`thumbv7neon-unknown-linux-musleabihf` | ? | | Thumb2-mode Armv7-A Linux with NEON, musl 1.2.3
371372
[`wasm32-wasip2`](platform-support/wasm32-wasip2.md) | ✓ | | WebAssembly
372373
[`wasm64-unknown-unknown`](platform-support/wasm64-unknown-unknown.md) | ? | | WebAssembly
373-
[`x86_64-apple-ios-macabi`](platform-support/apple-ios-macabi.md) | ✓ | | Apple Catalyst on x86_64
374374
[`x86_64-apple-tvos`](platform-support/apple-tvos.md) | ✓ | | x86 64-bit tvOS
375375
[`x86_64-apple-watchos-sim`](platform-support/apple-watchos.md) | ✓ | | x86 64-bit Apple WatchOS simulator
376376
[`x86_64-pc-nto-qnx710`](platform-support/nto-qnx.md) | ✓ | | x86 64-bit QNX Neutrino 7.1 RTOS |

‎src/doc/rustc/src/platform-support/apple-ios-macabi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Apple Mac Catalyst targets.
44

5-
**Tier: 3**
5+
**Tier: 2 (without Host Tools)**
66

77
- `aarch64-apple-ios-macabi`: Mac Catalyst on ARM64.
88
- `x86_64-apple-ios-macabi`: Mac Catalyst on 64-bit x86.

‎src/etc/test-float-parse/Cargo.toml

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ version = "0.1.0"
44
edition = "2021"
55
publish = false
66

7-
[workspace]
8-
resolver = "1"
9-
107
[dependencies]
11-
rand = "0.8"
8+
indicatif = { version = "0.17.8", default-features = false }
9+
num = "0.4.3"
10+
rand = "0.8.5"
11+
rand_chacha = "0.3"
12+
rayon = "1"
1213

1314
[lib]
1415
name = "test_float_parse"

0 commit comments

Comments
 (0)