tautschnig
diff --git a/‎.github/workflows/flux.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/flux.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/kani.yml‎
Lines changed: 1 addition & 0 deletions b/‎.github/workflows/kani.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎library/Cargo.lock‎
Lines changed: 23 additions & 1 deletion b/‎library/Cargo.lock‎
Lines changed: 23 additions & 1 deletion
diff --git a/‎library/alloc/src/borrow.rs‎
Lines changed: 11 additions & 4 deletions b/‎library/alloc/src/borrow.rs‎
Lines changed: 11 additions & 4 deletions
diff --git a/‎library/alloc/src/boxed.rs‎
Lines changed: 0 additions & 5 deletions b/‎library/alloc/src/boxed.rs‎
Lines changed: 0 additions & 5 deletions
diff --git a/‎library/alloc/src/boxed/convert.rs‎
Lines changed: 1 addition & 6 deletions b/‎library/alloc/src/boxed/convert.rs‎
Lines changed: 1 addition & 6 deletions
diff --git a/‎library/alloc/src/collections/btree/map/entry.rs‎
Lines changed: 0 additions & 4 deletions b/‎library/alloc/src/collections/btree/map/entry.rs‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎library/alloc/src/collections/mod.rs‎
Lines changed: 4 additions & 2 deletions b/‎library/alloc/src/collections/mod.rs‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎library/alloc/src/ffi/c_str.rs‎
Lines changed: 2 additions & 19 deletions b/‎library/alloc/src/ffi/c_str.rs‎
Lines changed: 2 additions & 19 deletions
diff --git a/‎library/alloc/src/fmt.rs‎
Lines changed: 1 addition & 1 deletion b/‎library/alloc/src/fmt.rs‎
Lines changed: 1 addition & 1 deletion
@@ -9,7 +9,7 @@ on:
 
 env:
   FIXPOINT_VERSION: "556104ba5508891c357b0bdf819ce706e93d9349"
-  FLUX_VERSION: "b0cec81c42bc6e210f675b46dd5b4b16774b0d0e"
+  FLUX_VERSION: "f5e57bec353e2eb3550d2b7ba086462264dfa290"
 
 jobs:
   check-flux-on-core:
 
@@ -198,6 +198,7 @@ jobs:
             --include-pattern time::Duration::from_micros \
             --include-pattern time::Duration::from_millis \
             --include-pattern time::Duration::from_nanos \
+            --exclude-pattern time::Duration::from_nanos_u128 \
             --include-pattern time::Duration::from_secs \
             --exclude-pattern time::Duration::from_secs_f \
             --include-pattern unicode::unicode_data::conversions::to_ \
 
@@ -17,9 +17,11 @@ use crate::fmt;
 use crate::string::String;
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<'a, B: ?Sized> Borrow<B> for Cow<'a, B>
+#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
+impl<'a, B: ?Sized> const Borrow<B> for Cow<'a, B>
 where
     B: ToOwned,
+    B::Owned: [const] Borrow<B>,
 {
     fn borrow(&self) -> &B {
         &**self
@@ -326,9 +328,10 @@ impl<B: ?Sized + ToOwned> Cow<'_, B> {
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<B: ?Sized + ToOwned> Deref for Cow<'_, B>
+#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
+impl<B: ?Sized + ToOwned> const Deref for Cow<'_, B>
 where
-    B::Owned: Borrow<B>,
+    B::Owned: [const] Borrow<B>,
 {
     type Target = B;
 
@@ -439,7 +442,11 @@ where
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl<T: ?Sized + ToOwned> AsRef<T> for Cow<'_, T> {
+#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
+impl<T: ?Sized + ToOwned> const AsRef<T> for Cow<'_, T>
+where
+    T::Owned: [const] Borrow<T>,
+{
     fn as_ref(&self) -> &T {
         self
     }
 
@@ -2128,11 +2128,6 @@ impl<F: ?Sized + Future + Unpin, A: Allocator> Future for Box<F, A> {
 
 #[stable(feature = "box_error", since = "1.8.0")]
 impl<E: Error> Error for Box<E> {
-    #[allow(deprecated, deprecated_in_future)]
-    fn description(&self) -> &str {
-        Error::description(&**self)
-    }
-
     #[allow(deprecated)]
     fn cause(&self) -> Option<&dyn Error> {
         Error::cause(&**self)
 
@@ -608,12 +608,7 @@ impl<'a> From<String> for Box<dyn Error + Send + Sync + 'a> {
     fn from(err: String) -> Box<dyn Error + Send + Sync + 'a> {
         struct StringError(String);
 
-        impl Error for StringError {
-            #[allow(deprecated)]
-            fn description(&self) -> &str {
-                &self.0
-            }
-        }
+        impl Error for StringError {}
 
         impl fmt::Display for StringError {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 
@@ -136,10 +136,6 @@ impl<'a, K: Debug + Ord, V: Debug, A: Allocator + Clone> fmt::Display
 impl<'a, K: core::fmt::Debug + Ord, V: core::fmt::Debug> core::error::Error
     for crate::collections::btree_map::OccupiedError<'a, K, V>
 {
-    #[allow(deprecated)]
-    fn description(&self) -> &str {
-        "key already exists"
-    }
 }
 
 impl<'a, K: Ord, V, A: Allocator + Clone> Entry<'a, K, V, A> {
 
@@ -128,17 +128,19 @@ pub use realalloc::collections::TryReserveErrorKind;
     reason = "Uncertain how much info should be exposed",
     issue = "48043"
 )]
+#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
 #[cfg(not(test))]
-impl From<TryReserveErrorKind> for TryReserveError {
+impl const From<TryReserveErrorKind> for TryReserveError {
     #[inline]
     fn from(kind: TryReserveErrorKind) -> Self {
         Self { kind }
     }
 }
 
 #[unstable(feature = "try_reserve_kind", reason = "new API", issue = "48043")]
+#[rustc_const_unstable(feature = "const_convert", issue = "143773")]
 #[cfg(not(test))]
-impl From<LayoutError> for TryReserveErrorKind {
+impl const From<LayoutError> for TryReserveErrorKind {
     /// Always evaluates to [`TryReserveErrorKind::CapacityOverflow`].
     #[inline]
     fn from(_: LayoutError) -> Self {
 
@@ -1061,17 +1061,10 @@ impl IntoStringError {
     }
 }
 
-impl IntoStringError {
-    fn description(&self) -> &str {
-        "C string contained non-utf8 bytes"
-    }
-}
-
 #[stable(feature = "cstring_into", since = "1.7.0")]
 impl fmt::Display for IntoStringError {
-    #[allow(deprecated, deprecated_in_future)]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        self.description().fmt(f)
+        "C string contained non-utf8 bytes".fmt(f)
     }
 }
 
@@ -1291,23 +1284,13 @@ impl PartialEq<CString> for Cow<'_, CStr> {
 }
 
 #[stable(feature = "rust1", since = "1.0.0")]
-impl core::error::Error for NulError {
-    #[allow(deprecated)]
-    fn description(&self) -> &str {
-        "nul byte found in data"
-    }
-}
+impl core::error::Error for NulError {}
 
 #[stable(feature = "cstring_from_vec_with_nul", since = "1.58.0")]
 impl core::error::Error for FromVecWithNulError {}
 
 #[stable(feature = "cstring_into", since = "1.7.0")]
 impl core::error::Error for IntoStringError {
-    #[allow(deprecated)]
-    fn description(&self) -> &str {
-        "C string contained non-utf8 bytes"
-    }
-
     fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
         Some(&self.error)
     }
 
@@ -354,7 +354,7 @@
 //! sign := '+' | '-'
 //! width := count
 //! precision := count | '*'
-//! type := '?' | 'x?' | 'X?' | identifier
+//! type := '?' | 'x?' | 'X?' | 'o' | 'x' | 'X' | 'p' | 'b' | 'e' | 'E'
 //! count := parameter | integer
 //! parameter := argument '$'
 //! ```
Original file line number	Diff line number	Diff line change
`@@ -136,10 +136,6 @@ impl<'a, K: Debug + Ord, V: Debug, A: Allocator + Clone> fmt::Display`
`136`	`136`	`impl<'a, K: core::fmt::Debug + Ord, V: core::fmt::Debug> core::error::Error`
`137`	`137`	`for crate::collections::btree_map::OccupiedError<'a, K, V>`
`138`	`138`	`{`
`139`		`- #[allow(deprecated)]`
`140`		`- fn description(&self) -> &str {`
`141`		`- "key already exists"`
`142`		`- }`
`143`	`139`	`}`
`144`	`140`
`145`	`141`	`impl<'a, K: Ord, V, A: Allocator + Clone> Entry<'a, K, V, A> {`