Merge from rustc · model-checking/verify-rust-std@05812a0

11#![doc = include_str!("error.md")]2-#![unstable(feature = "error_in_core", issue = "103765")]2+#![stable(feature = "error_in_core", since = "CURRENT_RUSTC_VERSION")]3344#[cfg(test)]55mod tests;

@@ -130,7 +130,6 @@ pub trait Error: Debug + Display {

130130 ///131131 /// ```rust132132 /// #![feature(error_generic_member_access)]133- /// #![feature(error_in_core)]134133 /// use core::fmt;135134 /// use core::error::{request_ref, Request};136135 ///

@@ -361,8 +360,7 @@ impl dyn Error {

361360/// Get a string value from an error.362361///363362/// ```rust364-/// # #![feature(error_generic_member_access)]365-/// # #![feature(error_in_core)]363+/// #![feature(error_generic_member_access)]366364/// use std::error::Error;367365/// use core::error::request_value;368366///

@@ -385,8 +383,7 @@ where

385383/// Get a string reference from an error.386384///387385/// ```rust388-/// # #![feature(error_generic_member_access)]389-/// # #![feature(error_in_core)]386+/// #![feature(error_generic_member_access)]390387/// use core::error::Error;391388/// use core::error::request_ref;392389///

@@ -458,7 +455,6 @@ where

458455///459456/// ```460457/// #![feature(error_generic_member_access)]461-/// #![feature(error_in_core)]462458/// use core::fmt;463459/// use core::error::Request;464460/// use core::error::request_ref;

@@ -529,7 +525,6 @@ impl<'a> Request<'a> {

529525 ///530526 /// ```rust531527 /// #![feature(error_generic_member_access)]532- /// #![feature(error_in_core)]533528 ///534529 /// use core::error::Request;535530 ///

@@ -564,7 +559,6 @@ impl<'a> Request<'a> {

564559 ///565560 /// ```rust566561 /// #![feature(error_generic_member_access)]567- /// #![feature(error_in_core)]568562 ///569563 /// use core::error::Request;570564 ///

@@ -600,7 +594,6 @@ impl<'a> Request<'a> {

600594 ///601595 /// ```rust602596 /// #![feature(error_generic_member_access)]603- /// #![feature(error_in_core)]604597 ///605598 /// use core::error::Request;606599 ///

@@ -633,7 +626,6 @@ impl<'a> Request<'a> {

633626 ///634627 /// ```rust635628 /// #![feature(error_generic_member_access)]636- /// #![feature(error_in_core)]637629 ///638630 /// use core::error::Request;639631 ///

@@ -700,7 +692,6 @@ impl<'a> Request<'a> {

700692 ///701693 /// ```rust702694 /// #![feature(error_generic_member_access)]703- /// #![feature(error_in_core)]704695 ///705696 /// use core::error::Request;706697 /// use core::error::request_value;

@@ -788,7 +779,6 @@ impl<'a> Request<'a> {

788779 ///789780 /// ```rust790781 /// #![feature(error_generic_member_access)]791- /// #![feature(error_in_core)]792782 ///793783 /// use core::error::Request;794784 /// use core::error::request_ref;