Auto merge of rust-lang#106324 - compiler-errors:rollup-2m9njin, r=compiler-errors

Rollup of 9 pull requests Successful merges: - rust-lang#105903 (Unify id-based thread parking implementations) - rust-lang#106232 (CFI: Monomorphize transparent ADTs before typeid) - rust-lang#106248 (Revert "Implement allow-by-default `multiple_supertrait_upcastable` lint") - rust-lang#106286 (Make tidy errors red) - rust-lang#106295 (Extend scraped examples layout GUI test for position of buttons) - rust-lang#106305 ( bootstrap: Get rid of tail_args in stream_cargo) - rust-lang#106310 (Dont use `--merge-base` during bootstrap formatting subcommand) - rust-lang#106314 (Fix panic on `x build --help`) - rust-lang#106317 (Only deduplicate stack traces for good path bugs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Author: bors

Cargo.lock

@@ -2675,9 +2675,9 @@ dependencies = [
 
 [[package]]
 name = "owo-colors"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "packed_simd_2"
@@ -5203,9 +5203,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
@@ -5309,6 +5309,7 @@ dependencies = [
  "lazy_static",
  "miropt-test-tools",
  "regex",
+ "termcolor",
  "walkdir",
 ]
 

compiler/rustc_driver/src/lib.rs

@@ -1199,8 +1199,8 @@ static DEFAULT_HOOK: LazyLock<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send +
  };
 
  // Invoke the default handler, which prints the actual panic message and optionally a backtrace
- // Don't do this for `ExplicitBug`, which has an unhelpful message and backtrace.
- if !info.payload().is::<rustc_errors::ExplicitBug>() {
+ // Don't do this for `GoodPathBug`, which already emits its own more useful backtrace.
+ if !info.payload().is::<rustc_errors::GoodPathBug>() {
  (*DEFAULT_HOOK)(info);
 
  // Separate the output with an empty line
@@ -1237,7 +1237,9 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str) {
 
  // a .span_bug or .bug call has already printed what
  // it wants to print.
- if !info.payload().is::<rustc_errors::ExplicitBug>() {
+ if !info.payload().is::<rustc_errors::ExplicitBug>()
+ && !info.payload().is::<rustc_errors::GoodPathBug>()
+ {
  let mut d = rustc_errors::Diagnostic::new(rustc_errors::Level::Bug, "unexpected panic");
  handler.emit_diagnostic(&mut d);
  }

compiler/rustc_errors/src/lib.rs

@@ -40,12 +40,13 @@ use rustc_span::source_map::SourceMap;
 use rustc_span::HashStableContext;
 use rustc_span::{Loc, Span};
 
+use std::any::Any;
 use std::borrow::Cow;
+use std::fmt;
 use std::hash::Hash;
 use std::num::NonZeroUsize;
 use std::panic;
 use std::path::Path;
-use std::{error, fmt};
 
 use termcolor::{Color, ColorSpec};
 
@@ -361,16 +362,11 @@ pub use rustc_span::fatal_error::{FatalError, FatalErrorMarker};
 
 /// Signifies that the compiler died with an explicit call to `.bug`
 /// or `.span_bug` rather than a failed assertion, etc.
-#[derive(Copy, Clone, Debug)]
 pub struct ExplicitBug;
 
-impl fmt::Display for ExplicitBug {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(f, "parser internal bug")
- }
-}
-
-impl error::Error for ExplicitBug {}
+/// Signifies that the compiler died with an explicit call to `.delay_good_path_bug`
+/// rather than a failed assertion, etc.
+pub struct GoodPathBug;
 
 pub use diagnostic::{
  AddToDiagnostic, DecorateLint, Diagnostic, DiagnosticArg, DiagnosticArgValue, DiagnosticId,
@@ -507,7 +503,11 @@ impl Drop for HandlerInner {
 
  if !self.has_errors() {
  let bugs = std::mem::replace(&mut self.delayed_span_bugs, Vec::new());
- self.flush_delayed(bugs, "no errors encountered even though `delay_span_bug` issued");
+ self.flush_delayed(
+ bugs,
+ "no errors encountered even though `delay_span_bug` issued",
+ ExplicitBug,
+ );
  }
 
  // FIXME(eddyb) this explains what `delayed_good_path_bugs` are!
@@ -520,6 +520,7 @@ impl Drop for HandlerInner {
  self.flush_delayed(
  bugs.into_iter().map(DelayedDiagnostic::decorate),
  "no warnings or errors encountered even though `delayed_good_path_bugs` issued",
+ GoodPathBug,
  );
  }
 
@@ -1203,7 +1204,11 @@ impl Handler {
  pub fn flush_delayed(&self) {
  let mut inner = self.inner.lock();
  let bugs = std::mem::replace(&mut inner.delayed_span_bugs, Vec::new());
- inner.flush_delayed(bugs, "no errors encountered even though `delay_span_bug` issued");
+ inner.flush_delayed(
+ bugs,
+ "no errors encountered even though `delay_span_bug` issued",
+ ExplicitBug,
+ );
  }
 }
 
@@ -1580,6 +1585,7 @@ impl HandlerInner {
  &mut self,
  bugs: impl IntoIterator<Item = Diagnostic>,
  explanation: impl Into<DiagnosticMessage> + Copy,
+ panic_with: impl Any + Send + 'static,
  ) {
  let mut no_bugs = true;
  for mut bug in bugs {
@@ -1607,7 +1613,7 @@ impl HandlerInner {
 
  // Panic with `ExplicitBug` to avoid "unexpected panic" messages.
  if !no_bugs {
- panic::panic_any(ExplicitBug);
+ panic::panic_any(panic_with);
  }
  }
 

compiler/rustc_feature/src/active.rs

@@ -160,8 +160,6 @@ declare_features! (
  (active, intrinsics, "1.0.0", None, None),
  /// Allows using `#[lang = ".."]` attribute for linking items to special compiler logic.
  (active, lang_items, "1.0.0", None, None),
- /// Allows the `multiple_supertrait_upcastable` lint.
- (active, multiple_supertrait_upcastable, "CURRENT_RUSTC_VERSION", None, None),
  /// Allows using `#[omit_gdb_pretty_printer_section]`.
  (active, omit_gdb_pretty_printer_section, "1.5.0", None, None),
  /// Allows using `#[prelude_import]` on glob `use` items.

compiler/rustc_lint/src/lib.rs

@@ -61,7 +61,6 @@ mod late;
 mod let_underscore;
 mod levels;
 mod methods;
-mod multiple_supertrait_upcastable;
 mod non_ascii_idents;
 mod non_fmt_panic;
 mod nonstandard_style;
@@ -96,7 +95,6 @@ use hidden_unicode_codepoints::*;
 use internal::*;
 use let_underscore::*;
 use methods::*;
-use multiple_supertrait_upcastable::*;
 use non_ascii_idents::*;
 use non_fmt_panic::NonPanicFmt;
 use nonstandard_style::*;
@@ -231,7 +229,6 @@ late_lint_methods!(
  InvalidAtomicOrdering: InvalidAtomicOrdering,
  NamedAsmLabels: NamedAsmLabels,
  OpaqueHiddenInferredBound: OpaqueHiddenInferredBound,
- MultipleSupertraitUpcastable: MultipleSupertraitUpcastable,
  ]
  ]
 );

compiler/rustc_lint/src/multiple_supertrait_upcastable.rs

@@ -944,7 +944,6 @@ symbols! {
  mul,
  mul_assign,
  mul_with_overflow,
- multiple_supertrait_upcastable,
  must_not_suspend,
  must_use,
  naked,

compiler/rustc_span/src/symbol.rs

@@ -164,6 +164,7 @@ fn encode_const<'tcx>(
 
 /// Encodes a FnSig using the Itanium C++ ABI with vendor extended type qualifiers and types for
 /// Rust types that are not used at the FFI boundary.
+#[instrument(level = "trace", skip(tcx, dict))]
 fn encode_fnsig<'tcx>(
  tcx: TyCtxt<'tcx>,
  fn_sig: &FnSig<'tcx>,
@@ -653,6 +654,7 @@ fn encode_ty<'tcx>(
 // Transforms a ty:Ty for being encoded and used in the substitution dictionary. It transforms all
 // c_void types into unit types unconditionally, and generalizes all pointers if
 // TransformTyOptions::GENERALIZE_POINTERS option is set.
+#[instrument(level = "trace", skip(tcx))]
 fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptions) -> Ty<'tcx> {
  let mut ty = ty;
 
@@ -698,7 +700,7 @@ fn transform_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, options: TransformTyOptio
  !is_zst
  });
  if let Some(field) = field {
- let ty0 = tcx.type_of(field.did);
+ let ty0 = tcx.bound_type_of(field.did).subst(tcx, substs);
  // Generalize any repr(transparent) user-defined type that is either a pointer
  // or reference, and either references itself or any other type that contains or
  // references itself, to avoid a reference cycle.
@@ -827,6 +829,7 @@ fn transform_substs<'tcx>(
 
 /// Returns a type metadata identifier for the specified FnAbi using the Itanium C++ ABI with vendor
 /// extended type qualifiers and types for Rust types that are not used at the FFI boundary.
+#[instrument(level = "trace", skip(tcx))]
 pub fn typeid_for_fnabi<'tcx>(
  tcx: TyCtxt<'tcx>,
  fn_abi: &FnAbi<'tcx, Ty<'tcx>>,

compiler/rustc_symbol_mangling/src/typeid/typeid_itanium_cxx_abi.rs

@@ -87,7 +87,6 @@
 #![warn(missing_debug_implementations)]
 #![warn(missing_docs)]
 #![allow(explicit_outlives_requirements)]
-#![cfg_attr(not(bootstrap), warn(multiple_supertrait_upcastable))]
 //
 // Library features:
 #![feature(alloc_layout_extra)]
@@ -192,7 +191,6 @@
 #![feature(unsized_fn_params)]
 #![feature(c_unwind)]
 #![feature(with_negative_coherence)]
-#![cfg_attr(not(bootstrap), feature(multiple_supertrait_upcastable))]
 //
 // Rustdoc features:
 #![feature(doc_cfg)]

library/alloc/src/lib.rs

@@ -28,7 +28,6 @@ use crate::fmt::{Debug, Display};
 #[stable(feature = "rust1", since = "1.0.0")]
 #[cfg_attr(not(test), rustc_diagnostic_item = "Error")]
 #[rustc_has_incoherent_inherent_impls]
-#[cfg_attr(not(bootstrap), allow(multiple_supertrait_upcastable))]
 pub trait Error: Debug + Display {
  /// The lower-level source of this error, if any.
  ///