Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d6b151f

Browse files
committedJan 22, 2024
Auto merge of #120251 - matthiaskrgr:rollup-gttrw68, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #119664 (Fix tty detection for msys2's `/dev/ptmx`) - #120104 (never_patterns: Count `!` bindings as diverging) - #120109 (Move cmath into `sys`) - #120143 (Consolidate logic around resolving built-in coroutine trait impls) - #120159 (Track `verbose` and `verbose_internals`) - #120216 (Fix a `trimmed_def_paths` assertion failure.) - #120220 (Document `Token{Stream,Tree}::Display` more thoroughly.) - #120233 (Revert stabilization of trait_upcasting feature) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d5fd099 + a787232 commit d6b151f

File tree

109 files changed

+816
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+816
-214
lines changed
 

‎compiler/rustc_feature/src/accepted.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,6 @@ declare_features! (
339339
/// Allows `#[track_caller]` to be used which provides
340340
/// accurate caller location reporting during panic (RFC 2091).
341341
(accepted, track_caller, "1.46.0", Some(47809)),
342-
/// Allows dyn upcasting trait objects via supertraits.
343-
/// Dyn upcasting is casting, e.g., `dyn Foo -> dyn Bar` where `Foo: Bar`.
344-
(accepted, trait_upcasting, "1.76.0", Some(65991)),
345342
/// Allows #[repr(transparent)] on univariant enums (RFC 2645).
346343
(accepted, transparent_enums, "1.42.0", Some(60405)),
347344
/// Allows indexing tuples.

‎compiler/rustc_feature/src/unstable.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,9 @@ declare_features! (
584584
(unstable, thread_local, "1.0.0", Some(29594)),
585585
/// Allows defining `trait X = A + B;` alias items.
586586
(unstable, trait_alias, "1.24.0", Some(41517)),
587+
/// Allows dyn upcasting trait objects via supertraits.
588+
/// Dyn upcasting is casting, e.g., `dyn Foo -> dyn Bar` where `Foo: Bar`.
589+
(unstable, trait_upcasting, "1.56.0", Some(65991)),
587590
/// Allows for transmuting between arrays with sizes that contain generic consts.
588591
(unstable, transmute_generic_consts, "1.70.0", Some(109929)),
589592
/// Allows #[repr(transparent)] on unions (RFC 2645).

0 commit comments

Comments
 (0)