diff options
| author | bors <bors@rust-lang.org> | 2025-03-15 16:27:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-15 16:27:19 +0000 |
| commit | 4eb161250e340c8f48f66e2b929ef4a5bed7c181 (patch) | |
| tree | c418bfb9d805b965e00cf7e01f06014ae8d46af2 /tests/run-make | |
| parent | 4d91de4e48198da2e33413efdcd9cd2cc0c46688 (diff) | |
| parent | 4d11490950147b333cb13c0efb579127e37f7104 (diff) | |
| download | rust-1.85.1.tar.gz rust-1.85.1.zip | |
Auto merge of #138521 - cuviper:stable-next, r=cuviper 1.85.1
[stable] Release 1.85.1 - [Fix the doctest-merging feature of the 2024 Edition.](https://github.com/rust-lang/rust/pull/137899/) - [Relax some `target_feature` checks when generating docs.](https://github.com/rust-lang/rust/pull/137632/) - [Fix errors in `std::fs::rename` on Windows 1607.](https://github.com/rust-lang/rust/pull/137528/) - [Downgrade bootstrap `cc` to fix custom targets.](https://github.com/rust-lang/rust/pull/137460/) - [Skip submodule updates when building Rust from a source tarball.](https://github.com/rust-lang/rust/pull/137338/) Added backports to fix CI: - Remove latest Windows SDK from 32-bit CI #137753 - Do not install rustup on Rust for Linux job #137947 cc `@rust-lang/release` r? cuviper
Diffstat (limited to 'tests/run-make')
| -rw-r--r-- | tests/run-make/doctests-merge/rmake.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/run-make/doctests-merge/rmake.rs b/tests/run-make/doctests-merge/rmake.rs index a25da7403e2..a88b050c50f 100644 --- a/tests/run-make/doctests-merge/rmake.rs +++ b/tests/run-make/doctests-merge/rmake.rs @@ -8,7 +8,6 @@ fn test_and_compare(input_file: &str, stdout_file: &str, edition: &str, dep: &Pa let output = cmd .input(input_file) .arg("--test") - .arg("-Zunstable-options") .edition(edition) .arg("--test-args=--test-threads=1") .extern_("foo", dep.display().to_string()) |