Rollup of 12 pull requests

[TaKO8Ki]

Successful merges:

• Undeprecate lint unstable_features and make use of it in the compiler #118639 (Undeprecate lint unstable_features and make use of it in the compiler)
• Explanation that fields are being used when deriving (Partial)Ord on enums #118714 ( Explanation that fields are being used when deriving (Partial)Ord on enums)
• Fix deallocation with wrong allocator in (A)Rc::from_box_in #119801 (Fix deallocation with wrong allocator in (A)Rc::from_box_in)
• Make unsafe_op_in_unsafe_fn migrated in edition 2024 #119948 (Make unsafe_op_in_unsafe_fn migrated in edition 2024)
• remote-test: use u64 to represent file size #119999 (remote-test: use u64 to represent file size)
• bootstrap: improvements for compiler builds #120058 (bootstrap: improvements for compiler builds)
• Manually implement derived NonZero traits. #120160 (Manually implement derived NonZero traits.)
• Remove duplicate dependencies for rustc #120177 (Remove duplicate dependencies for rustc)
• coverage: Don't instrument #[automatically_derived] functions #120185 (coverage: Don't instrument #[automatically_derived] functions)
• Shorten #[must_use] Diagnostic Message for Option::is_none #120194 (Shorten #[must_use] Diagnostic Message for Option::is_none)
• Correct the anchor of an URL in an error message #120200 (Correct the anchor of an URL in an error message)
• Replace #!/bin/bash with #!/usr/bin/env bash in rust-installer tests #120203 (Replace #!/bin/bash with #!/usr/bin/env bash in rust-installer tests)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

[TaKO8Ki]

@bors r+ rollup=never p=12

[bors]

📌 Commit 1024093 has been approved by TaKO8Ki

It is now in the queue for this repository.

[bors]

⌛ Testing commit 1024093 with merge 8ace346...

[rust-log-analyzer]

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

---- [coverage-run] tests/coverage-run-rustdoc/doctest.rs stdout ----
diff of coverage:

34    LL|       |//!
35    LL|       |//! doctest returning a result:
36    LL|      1|//! ```
-    LL|      2|//! #[derive(Debug, PartialEq)]
-                        ^1
+    LL|      1|//! #[derive(Debug, PartialEq)]
39    LL|      1|//! struct SomeError {
40    LL|      1|//!     msg: String,
41    LL|      1|//! }

63    LL|      1|//!     println!("called some_func()");
64    LL|      1|//! }
65    LL|       |//!
-    LL|      0|//! #[derive(Debug)]
Build completed unsuccessfully in 0:25:51
+    LL|       |//! #[derive(Debug)]
67    LL|       |//! struct SomeError;
68    LL|       |//!
69    LL|       |//! extern crate doctest_crate;

The actual coverage differed from the expected coverage.
The actual coverage differed from the expected coverage.
Actual coverage saved to /checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/doctest.coverage
error: 1 errors occurred comparing coverage output.
status: exit status: 0
status: exit status: 0
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/llvm-cov" "show" "--format=text" "--show-line-counts-or-regions" "--Xdemangler" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/rust-demangler" "--instr-profile" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/default.profdata" "--object" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/a" "--object" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/doc_bins/_checkout_tests_coverage_run_rustdoc_doctest_rs_18_0/rust_out" "--object" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/doc_bins/_checkout_tests_coverage_run_rustdoc_doctest_rs_24_0/rust_out" "--object" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/doc_bins/_checkout_tests_coverage_run_rustdoc_doctest_rs_46_0/rust_out" "--object" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/doc_bins/_checkout_tests_coverage_run_rustdoc_doctest_rs_70_0/rust_out" "--object" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/coverage-run-rustdoc/doctest.coverage-run/doc_bins/_checkout_tests_coverage_run_rustdoc_doctest_rs_7_0/rust_out"
/checkout/tests/coverage-run-rustdoc/auxiliary/doctest_crate.rs:
/checkout/tests/coverage-run-rustdoc/auxiliary/doctest_crate.rs:
    1|       |/// A function run only from within doctests
    2|      3|pub fn fn_run_in_doctests(conditional: usize) {
    3|      3|    match conditional {
    4|      1|        1 => assert_eq!(1, 1), // this is run,
    5|      1|        2 => assert_eq!(1, 1), // this,
    6|      1|        3 => assert_eq!(1, 1), // and this too
    7|      0|        _ => assert_eq!(1, 2), // however this is not
    9|      3|}

/checkout/tests/coverage-run-rustdoc/doctest.rs:
/checkout/tests/coverage-run-rustdoc/doctest.rs:
    1|       |// aux-build:doctest_crate.rs
    2|       |
    3|       |//! This test ensures that code from doctests is properly re-mapped.
    4|       |//! See <https://github.com/rust-lang/rust/issues/79417> for more info.
    5|       |//!
    6|       |//! Just some random code:
    7|      1|//! ```
    8|      1|//! if true {
    9|       |//!     // this is executed!
   10|      1|//!     assert_eq!(1, 1);
   11|       |//! } else {
   12|       |//!     // this is not!
   13|      0|//!     assert_eq!(1, 2);
   14|       |//! }
   15|      1|//! ```
   16|       |//!
   17|       |//! doctest testing external code:
   18|       |//! ```
   19|      1|//! extern crate doctest_crate;
   20|      1|//! doctest_crate::fn_run_in_doctests(1);
   21|      1|//! ```
   22|       |//!
   23|       |//! doctest returning a result:
   24|      1|//! ```
   25|      1|//! #[derive(Debug, PartialEq)]
   26|      1|//! struct SomeError {
   27|      1|//!     msg: String,
   28|      1|//! }
   29|      1|//! let mut res = Err(SomeError { msg: String::from("a message") });
   30|      1|//! if res.is_ok() {
   31|      0|//!     res?;
   32|       |//! } else {
   33|      1|//!     if *res.as_ref().unwrap_err() == *res.as_ref().unwrap_err() {
   34|      1|//!         println!("{:?}", res);
   35|      1|//!     }
                   ^0
   36|      1|//!     if *res.as_ref().unwrap_err() == *res.as_ref().unwrap_err() {
   37|      1|//!         res = Ok(1);
   38|      1|//!     }
                   ^0
   39|      1|//!     res = Ok(0);
   40|       |//! }
   41|       |//! // need to be explicit because rustdoc cant infer the return type
   42|      1|//! Ok::<(), SomeError>(())
   43|      1|//! ```
   44|       |//!
   45|       |//! doctest with custom main:
   46|       |//! ```
   47|      1|//! fn some_func() {
   48|      1|//!     println!("called some_func()");
   49|      1|//! }
   50|       |//!
   51|       |//! #[derive(Debug)]
   52|       |//! struct SomeError;
   53|       |//!
   54|       |//! extern crate doctest_crate;
   55|       |//!
   56|      1|//! fn doctest_main() -> Result<(), SomeError> {
   57|      1|//!     some_func();
   58|      1|//!     doctest_crate::fn_run_in_doctests(2);
   59|      1|//!     Ok(())
   60|      1|//! }
   61|       |//!
   62|       |//! // this `main` is not shown as covered, as it clashes with all the other
   63|       |//! // `main` functions that were automatically generated for doctests
   64|       |//! fn main() -> Result<(), SomeError> {
   65|       |//!     doctest_main()
   66|       |//! }
   67|       |//! ```
   68|       |
   69|       |/// doctest attached to fn testing external code:
   70|       |/// ```
   71|      1|/// extern crate doctest_crate;
   72|      1|/// doctest_crate::fn_run_in_doctests(3);
   73|      1|/// ```
   74|       |///
   75|      1|fn main() {
   77|      1|        assert_eq!(1, 1);
   78|       |    } else {
   79|      0|        assert_eq!(1, 2);
   80|       |    }
   80|       |    }
   81|      1|}
   82|       |
   83|       |// FIXME(Swatinem): Fix known issue that coverage code region columns need to be offset by the
   84|       |// doc comment line prefix (`///` or `//!`) and any additional indent (before or after the doc
   85|       |// comment characters). This test produces `llvm-cov show` results demonstrating the problem.
   86|       |//
   87|       |// One of the above tests now includes: `derive(Debug, PartialEq)`, producing an `llvm-cov show`
   88|       |// result with a distinct count for `Debug`, denoted by `^1`, but the caret points to the wrong
   89|       |// column. Similarly, the `if` blocks without `else` blocks show `^0`, which should point at, or
   90|       |// one character past, the `if` block's closing brace. In both cases, these are most likely off
   91|       |// by the number of characters stripped from the beginning of each doc comment line: indent
   92|       |// whitespace, if any, doc comment prefix (`//!` in this case) and (I assume) one space character
   93|       |// (?). Note, when viewing `llvm-cov show` results in `--color` mode, the column offset errors are
   94|       |// more pronounced, and show up in more places, with background color used to show some distinct
   95|       |// code regions with different coverage counts.
   96|       |//
   97|       |// NOTE: Since the doc comment line prefix may vary, one possible solution is to replace each
   98|       |// character stripped from the beginning of doc comment lines with a space. This will give coverage
   99|       |// results the correct column offsets, and I think it should compile correctly, but I don't know
  100|       |// what affect it might have on diagnostic messages from the compiler, and whether anyone would care
  101|       |// if the indentation changed. I don't know if there is a more viable solution.
stderr: none

[bors]

💔 Test failed - checks-actions