Auto merge of rust-lang#150324 - matthiaskrgr:rollup-cl7wrqn, r=matthiaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#149800 (Fix ICE in normalization during closure capture analysis (rust-lang#149746))
 - rust-lang#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang#150308 (Update bors configuration)
 - rust-lang#150314 (rustc-dev-guide subtree update)
 - rust-lang#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ on:
       - try
       - try-perf
       - automation/bors/try
+      - automation/bors/auto
   pull_request:
     branches:
       - "**"
@@ -56,7 +57,7 @@ jobs:
       - name: Test citool
         # Only test citool on the auto branch, to reduce latency of the calculate matrix job
         # on PR/try builds.
-        if: ${{ github.ref == 'refs/heads/auto' }}
+        if: ${{ github.ref == 'refs/heads/auto' || github.ref == 'refs/heads/automation/bors/auto' }}
         run: |
           cd src/ci/citool
           CARGO_INCREMENTAL=0 cargo test
@@ -79,7 +80,7 @@ jobs:
     # access the environment.
     #
     # We only enable the environment for the rust-lang/rust repository, so that CI works on forks.
-    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
+    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
     env:
       CI_JOB_NAME: ${{ matrix.name }}
       CI_JOB_DOC_URL: ${{ matrix.doc_url }}
@@ -313,7 +314,7 @@ jobs:
     needs: [ calculate_matrix, job ]
     # !cancelled() executes the job regardless of whether the previous jobs passed or failed
     if: ${{ !cancelled() && contains(fromJSON('["auto", "try"]'), needs.calculate_matrix.outputs.run_type) }}
-    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto')) && 'bors') || '' }}
+    environment: ${{ ((github.repository == 'rust-lang/rust' && (github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf' || github.ref == 'refs/heads/automation/bors/try' || github.ref == 'refs/heads/auto' || github.ref == 'refs/heads/automation/bors/auto')) && 'bors') || '' }}
     steps:
       - name: checkout the source code
         uses: actions/checkout@v5

compiler/rustc_middle/src/ty/context.rs

@@ -2273,6 +2273,12 @@ impl<'tcx> TyCtxt<'tcx> {
 
     #[inline]
     pub fn local_crate_exports_generics(self) -> bool {
+        // compiler-builtins has some special treatment in codegen, which can result in confusing
+        // behavior if another crate ends up calling into its monomorphizations.
+        // https://github.com/rust-lang/rust/issues/150173
+        if self.is_compiler_builtins(LOCAL_CRATE) {
+            return false;
+        }
         self.crate_types().iter().any(|crate_type| {
             match crate_type {
                 CrateType::Executable

compiler/rustc_middle/src/ty/util.rs

@@ -1394,8 +1394,10 @@ impl<'tcx> Ty<'tcx> {
 
                 // This doesn't depend on regions, so try to minimize distinct
                 // query keys used.
-                let erased = tcx.normalize_erasing_regions(typing_env, query_ty);
-                tcx.has_significant_drop_raw(typing_env.as_query_input(erased))
+                // FIX: Use try_normalize to avoid crashing. If it fails, return true.
+                tcx.try_normalize_erasing_regions(typing_env, query_ty)
+                    .map(|erased| tcx.has_significant_drop_raw(typing_env.as_query_input(erased)))
+                    .unwrap_or(true)
             }
         }
     }

compiler/rustc_session/src/config.rs

@@ -1798,7 +1798,7 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
             "<OPT>",
         ),
         opt(Stable, Flag, "", "test", "Build a test harness", ""),
-        opt(Stable, Opt, "", "target", "Target triple for which the code is compiled", "<TARGET>"),
+        opt(Stable, Opt, "", "target", "Target tuple for which the code is compiled", "<TARGET>"),
         opt(Stable, Multi, "A", "allow", "Set lint allowed", "<LINT>"),
         opt(Stable, Multi, "W", "warn", "Set lint warnings", "<LINT>"),
         opt(Stable, Multi, "", "force-warn", "Set lint force-warn", "<LINT>"),

rust-bors.toml

@@ -25,3 +25,42 @@ labels_blocking_approval = [
     "S-waiting-on-t-rustdoc-frontend",
     "S-waiting-on-t-clippy"
 ]
+
+# If CI runs quicker than this duration, consider it to be a failure
+min_ci_time = 600
+
+[labels]
+approved = [
+    "+S-waiting-on-bors",
+    "-S-blocked",
+    "-S-waiting-on-author",
+    "-S-waiting-on-crater",
+    "-S-waiting-on-review",
+    "-S-waiting-on-team"
+]
+unapproved = [
+    "+S-waiting-on-author",
+    "-S-blocked",
+    "-S-waiting-on-bors",
+    "-S-waiting-on-crater",
+    "-S-waiting-on-review",
+    "-S-waiting-on-team"
+]
+try_failed = [
+    "+S-waiting-on-author",
+    "-S-waiting-on-review",
+    "-S-waiting-on-crater"
+]
+auto_build_succeeded = ["+merged-by-bors"]
+auto_build_failed = [
+    "+S-waiting-on-review",
+    "-S-blocked",
+    "-S-waiting-on-bors",
+    "-S-waiting-on-author",
+    "-S-waiting-on-crater",
+    "-S-waiting-on-team"
+]
+
+# Flip this two once new bors is used for actual merges on this repository
+merge_queue_enabled = false
+report_merge_conflicts = true

src/ci/citool/src/main.rs

@@ -46,7 +46,9 @@ impl GitHubContext {
                 let patterns = if !patterns.is_empty() { Some(patterns) } else { None };
                 Some(RunType::TryJob { job_patterns: patterns })
             }
-            ("push", "refs/heads/auto") => Some(RunType::AutoJob),
+            ("push", "refs/heads/auto" | "refs/heads/automation/bors/auto") => {
+                Some(RunType::AutoJob)
+            }
             ("push", "refs/heads/main") => Some(RunType::MainJob),
             _ => None,
         }

src/doc/man/rustc.1

@@ -79,8 +79,8 @@ Provide a detailed explanation of an error message.
 Build a test harness.
 .TP
 \fB\-\-target\fR \fITARGET\fR
-Target triple for which the code is compiled. This option defaults to the host’s target
-triple. The target triple has the general format <arch><sub>\-<vendor>\-<sys>\-<abi>, where:
+Target tuple for which the code is compiled. This option defaults to the host’s target
+tuple. The target tuple has the general format <arch><sub>\-<vendor>\-<sys>\-<abi>, where:
 .RS
 .TP
 .B <arch>

src/doc/rustc-dev-guide/ci/sembr/Cargo.lock

@@ -148,12 +148,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
 [[package]]
 name = "globset"
 version = "0.4.18"
@@ -167,15 +161,6 @@ dependencies = [
  "regex-syntax",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash",
-]
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -198,16 +183,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "imara-diff"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f01d462f766df78ab820dd06f5eb700233c51f0f4c2e846520eaf4ba6aa5c5c"
-dependencies = [
- "hashbrown",
- "memchr",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.2"
@@ -295,7 +270,6 @@ dependencies = [
  "anyhow",
  "clap",
  "ignore",
- "imara-diff",
  "regex",
 ]
 

src/doc/rustc-dev-guide/ci/sembr/Cargo.toml

@@ -5,7 +5,6 @@ edition = "2024"
 [dependencies]
 anyhow = "1"
 ignore = "0.4"
-imara-diff = "0.2"
 
 [dependencies.regex]
 version = "1"

src/doc/rustc-dev-guide/ci/sembr/src/main.rs

@@ -5,7 +5,6 @@ use std::{fs, process};
 use anyhow::Result;
 use clap::Parser;
 use ignore::Walk;
-use imara_diff::{Algorithm, BasicLineDiffPrinter, Diff, InternedInput, UnifiedDiffConfig};
 use regex::Regex;
 
 #[derive(Parser)]
@@ -18,8 +17,6 @@ struct Cli {
     /// Applies to lines that are to be split
     #[arg(long, default_value_t = 100)]
     line_length_limit: usize,
-    #[arg(long)]
-    show_diff: bool,
 }
 
 static REGEX_IGNORE_END: LazyLock<Regex> =
@@ -54,10 +51,6 @@ fn main() -> Result<()> {
             } else if cli.overwrite {
                 fs::write(&path, new)?;
                 made_compliant.push(path.clone());
-            } else if cli.show_diff {
-                println!("{}:", path.display());
-                show_diff(&old, &new);
-                println!("---");
             } else {
                 not_compliant.push(path.clone());
             }
@@ -76,16 +69,6 @@ fn main() -> Result<()> {
     Ok(())
 }
 
-fn show_diff(old: &str, new: &str) {
-    let input = InternedInput::new(old, new);
-    let mut diff = Diff::compute(Algorithm::Histogram, &input);
-    diff.postprocess_lines(&input);
-    let diff = diff
-        .unified_diff(&BasicLineDiffPrinter(&input.interner), UnifiedDiffConfig::default(), &input)
-        .to_string();
-    print!("{diff}");
-}
-
 fn display(header: &str, paths: &[PathBuf]) {
     println!("{header}:");
     for element in paths {
@@ -96,7 +79,9 @@ fn display(header: &str, paths: &[PathBuf]) {
 fn ignore(line: &str, in_code_block: bool) -> bool {
     in_code_block
         || line.to_lowercase().contains("e.g.")
+        || line.to_lowercase().contains("n.b.")
         || line.contains("i.e.")
+        || line.contains("et. al")
         || line.contains('|')
         || line.trim_start().starts_with('>')
         || line.starts_with('#')
@@ -213,6 +198,9 @@ some code. block
 sentence with *italics* should not be ignored. truly.
 git log main.. compiler
  foo.   bar.  baz
+o? whatever
+r? @reviewer
+ r? @reviewer
 ";
     let expected = "
 # some. heading
@@ -238,12 +226,16 @@ git log main.. compiler
  foo.
    bar.
   baz
+o?
+whatever
+r? @reviewer
+ r? @reviewer
 ";
     assert_eq!(expected, comply(original));
 }
 
 #[test]
-fn test_prettify() {
+fn test_lengthen_lines() {
     let original = "\
 do not split
 short sentences
@@ -264,6 +256,12 @@ do not mess with code block chars
 leave the
 text alone
 ```
+
+ handle the
+ indented well
+
+[a target]: https://example.com
+[another target]: https://example.com
 ";
     let expected = "\
 do not split short sentences
@@ -284,43 +282,11 @@ do not mess with code block chars
 leave the
 text alone
 ```
-";
-    assert_eq!(expected, lengthen_lines(original, 50));
-}
 
-#[test]
-fn test_prettify_prefix_spaces() {
-    let original = "\
- do not split
- short sentences
-";
-    let expected = "\
- do not split short sentences
-";
-    assert_eq!(expected, lengthen_lines(original, 50));
-}
+ handle the indented well
 
-#[test]
-fn test_prettify_ignore_link_targets() {
-    let original = "\
 [a target]: https://example.com
 [another target]: https://example.com
 ";
-    assert_eq!(original, lengthen_lines(original, 100));
-}
-
-#[test]
-fn test_sembr_question_mark() {
-    let original = "
-o? whatever
-r? @reviewer
- r? @reviewer
-";
-    let expected = "
-o?
-whatever
-r? @reviewer
- r? @reviewer
-";
-    assert_eq!(expected, comply(original));
+    assert_eq!(expected, lengthen_lines(original, 50));
 }