Auto merge of #107443 - cjgillot:generator-less-query, r=compiler-errors

[rust.git] / library / core / src / error.rs

diff --git a/library/core/src/error.rs b/library/core/src/error.rs
index 7152300abcbf3a446cca031d797040d23abb2353..d2fac23ff18be7542729e0b6793d796daad17dd5 100644 (file)
--- a/library/core/src/error.rs
+++ b/library/core/src/error.rs
@@ -28,6 +28,7 @@
 #[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.
     ///