Skip to content

Commit a8b0950

Browse files
authored
Rollup merge of rust-lang#131109 - tgross35:stabilize-debug_more_non_exhaustive, r=joboet
Stabilize `debug_more_non_exhaustive` Fixes: rust-lang#127942
2 parents 637b515 + ea51d16 commit a8b0950

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

core/src/fmt/builders.rs

+4-12
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,6 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
366366
/// # Examples
367367
///
368368
/// ```
369-
/// #![feature(debug_more_non_exhaustive)]
370-
///
371369
/// use std::fmt;
372370
///
373371
/// struct Foo(i32, String);
@@ -385,7 +383,7 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
385383
/// "Foo(10, ..)",
386384
/// );
387385
/// ```
388-
#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]
386+
#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]
389387
pub fn finish_non_exhaustive(&mut self) -> fmt::Result {
390388
self.result = self.result.and_then(|_| {
391389
if self.fields > 0 {
@@ -606,8 +604,6 @@ impl<'a, 'b: 'a> DebugSet<'a, 'b> {
606604
/// # Examples
607605
///
608606
/// ```
609-
/// #![feature(debug_more_non_exhaustive)]
610-
///
611607
/// use std::fmt;
612608
///
613609
/// struct Foo(Vec<i32>);
@@ -630,7 +626,7 @@ impl<'a, 'b: 'a> DebugSet<'a, 'b> {
630626
/// "{1, 2, ..}",
631627
/// );
632628
/// ```
633-
#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]
629+
#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]
634630
pub fn finish_non_exhaustive(&mut self) -> fmt::Result {
635631
self.inner.result = self.inner.result.and_then(|_| {
636632
if self.inner.has_fields {
@@ -800,8 +796,6 @@ impl<'a, 'b: 'a> DebugList<'a, 'b> {
800796
/// # Examples
801797
///
802798
/// ```
803-
/// #![feature(debug_more_non_exhaustive)]
804-
///
805799
/// use std::fmt;
806800
///
807801
/// struct Foo(Vec<i32>);
@@ -824,7 +818,7 @@ impl<'a, 'b: 'a> DebugList<'a, 'b> {
824818
/// "[1, 2, ..]",
825819
/// );
826820
/// ```
827-
#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]
821+
#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]
828822
pub fn finish_non_exhaustive(&mut self) -> fmt::Result {
829823
self.inner.result.and_then(|_| {
830824
if self.inner.has_fields {
@@ -1126,8 +1120,6 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {
11261120
/// # Examples
11271121
///
11281122
/// ```
1129-
/// #![feature(debug_more_non_exhaustive)]
1130-
///
11311123
/// use std::fmt;
11321124
///
11331125
/// struct Foo(Vec<(String, i32)>);
@@ -1154,7 +1146,7 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {
11541146
/// r#"{"A": 10, "B": 11, ..}"#,
11551147
/// );
11561148
/// ```
1157-
#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]
1149+
#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]
11581150
pub fn finish_non_exhaustive(&mut self) -> fmt::Result {
11591151
self.result = self.result.and_then(|_| {
11601152
assert!(!self.has_key, "attempted to finish a map with a partial entry");

core/tests/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#![feature(core_io_borrowed_buf)]
3737
#![feature(core_private_bignum)]
3838
#![feature(core_private_diy_float)]
39-
#![feature(debug_more_non_exhaustive)]
4039
#![feature(dec2flt)]
4140
#![feature(duration_constants)]
4241
#![feature(duration_constructors)]

0 commit comments

Comments
 (0)