Skip to content

Commit f011b21

Browse files
committed
Reintroduce multiple_supertrait_upcastable lint
1 parent 915e273 commit f011b21

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

alloc/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
#![warn(missing_debug_implementations)]
8888
#![warn(missing_docs)]
8989
#![allow(explicit_outlives_requirements)]
90+
#![cfg_attr(not(bootstrap), warn(multiple_supertrait_upcastable))]
9091
//
9192
// Library features:
9293
#![feature(alloc_layout_extra)]
@@ -195,6 +196,7 @@
195196
#![feature(c_unwind)]
196197
#![feature(with_negative_coherence)]
197198
#![cfg_attr(test, feature(panic_update_hook))]
199+
#![cfg_attr(not(bootstrap), feature(multiple_supertrait_upcastable))]
198200
//
199201
// Rustdoc features:
200202
#![feature(doc_cfg)]

core/src/error.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ use crate::fmt::{Debug, Display};
2828
#[stable(feature = "rust1", since = "1.0.0")]
2929
#[cfg_attr(not(test), rustc_diagnostic_item = "Error")]
3030
#[rustc_has_incoherent_inherent_impls]
31+
#[cfg_attr(not(bootstrap), allow(multiple_supertrait_upcastable))]
3132
pub trait Error: Debug + Display {
3233
/// The lower-level source of this error, if any.
3334
///

core/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
#![warn(missing_docs)]
9696
#![allow(explicit_outlives_requirements)]
9797
#![allow(incomplete_features)]
98+
#![cfg_attr(not(bootstrap), warn(multiple_supertrait_upcastable))]
9899
//
99100
// Library features:
100101
#![feature(const_align_offset)]
@@ -235,6 +236,7 @@
235236
#![feature(unsized_fn_params)]
236237
#![feature(asm_const)]
237238
#![feature(const_transmute_copy)]
239+
#![cfg_attr(not(bootstrap), feature(multiple_supertrait_upcastable))]
238240
//
239241
// Target features:
240242
#![feature(arm_target_feature)]

0 commit comments

Comments
 (0)