Rollup merge of #131109 - tgross35:stabilize-debug_more_non_exhaustiv… · qinheping/verify-rust-std@a8b0950 (original) (raw)

`@@ -366,8 +366,6 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {

`

366

366

`/// # Examples

`

367

367

`///

`

368

368

```` /// ```

`369`

``

`-

/// #![feature(debug_more_non_exhaustive)]

`

`370`

``

`-

///

`

`371`

`369`

`/// use std::fmt;

`

`372`

`370`

`///

`

`373`

`371`

`/// struct Foo(i32, String);

`

`@@ -385,7 +383,7 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {

`

`385`

`383`

`/// "Foo(10, ..)",

`

`386`

`384`

`/// );

`

`387`

`385`

```` /// ```

388

``

`-

#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]

`

``

386

`+

#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]

`

389

387

`pub fn finish_non_exhaustive(&mut self) -> fmt::Result {

`

390

388

`self.result = self.result.and_then(|_| {

`

391

389

`if self.fields > 0 {

`

`@@ -606,8 +604,6 @@ impl<'a, 'b: 'a> DebugSet<'a, 'b> {

`

606

604

`/// # Examples

`

607

605

`///

`

608

606

```` /// ```

`609`

``

`-

/// #![feature(debug_more_non_exhaustive)]

`

`610`

``

`-

///

`

`611`

`607`

`/// use std::fmt;

`

`612`

`608`

`///

`

`613`

`609`

`/// struct Foo(Vec<i32>);

`

`@@ -630,7 +626,7 @@ impl<'a, 'b: 'a> DebugSet<'a, 'b> {

`

`630`

`626`

`/// "{1, 2, ..}",

`

`631`

`627`

`/// );

`

`632`

`628`

```` /// ```

633

``

`-

#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]

`

``

629

`+

#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]

`

634

630

`pub fn finish_non_exhaustive(&mut self) -> fmt::Result {

`

635

631

`self.inner.result = self.inner.result.and_then(|_| {

`

636

632

`if self.inner.has_fields {

`

`@@ -800,8 +796,6 @@ impl<'a, 'b: 'a> DebugList<'a, 'b> {

`

800

796

`/// # Examples

`

801

797

`///

`

802

798

```` /// ```

`803`

``

`-

/// #![feature(debug_more_non_exhaustive)]

`

`804`

``

`-

///

`

`805`

`799`

`/// use std::fmt;

`

`806`

`800`

`///

`

`807`

`801`

`/// struct Foo(Vec<i32>);

`

`@@ -824,7 +818,7 @@ impl<'a, 'b: 'a> DebugList<'a, 'b> {

`

`824`

`818`

`/// "[1, 2, ..]",

`

`825`

`819`

`/// );

`

`826`

`820`

```` /// ```

827

``

`-

#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]

`

``

821

`+

#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]

`

828

822

`pub fn finish_non_exhaustive(&mut self) -> fmt::Result {

`

829

823

`self.inner.result.and_then(|_| {

`

830

824

`if self.inner.has_fields {

`

`@@ -1126,8 +1120,6 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {

`

1126

1120

`/// # Examples

`

1127

1121

`///

`

1128

1122

```` /// ```

`1129`

``

`-

/// #![feature(debug_more_non_exhaustive)]

`

`1130`

``

`-

///

`

`1131`

`1123`

`/// use std::fmt;

`

`1132`

`1124`

`///

`

`1133`

`1125`

`/// struct Foo(Vec<(String, i32)>);

`

`@@ -1154,7 +1146,7 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> {

`

`1154`

`1146`

`/// r#"{"A": 10, "B": 11, ..}"#,

`

`1155`

`1147`

`/// );

`

`1156`

`1148`

```` /// ```

1157

``

`-

#[unstable(feature = "debug_more_non_exhaustive", issue = "127942")]

`

``

1149

`+

#[stable(feature = "debug_more_non_exhaustive", since = "CURRENT_RUSTC_VERSION")]

`

1158

1150

`pub fn finish_non_exhaustive(&mut self) -> fmt::Result {

`

1159

1151

`self.result = self.result.and_then(|_| {

`

1160

1152

`assert!(!self.has_key, "attempted to finish a map with a partial entry");

`