Merge b3e830c into 6dbbb67

vercel · Sep 22, 2023 · 8c890af · 8c890af
2 parents 6dbbb67 + b3e830c
commit 8c890af
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/turbo-tasks-macros/src/lib.rs b/crates/turbo-tasks-macros/src/lib.rs
@@ -1,3 +1,4 @@
+#![allow(internal_features)]
 #![feature(proc_macro_diagnostic)]
 #![feature(allow_internal_unstable)]
 #![feature(box_patterns)]

diff --git a/crates/turbo-tasks/src/lib.rs b/crates/turbo-tasks/src/lib.rs
@@ -29,7 +29,6 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 #![feature(result_flattening)]
 #![feature(error_generic_member_access)]
-#![feature(provide_any)]
 #![feature(new_uninit)]
 #![feature(arbitrary_self_types)]
 #![feature(async_fn_in_trait)]

diff --git a/crates/turbo-tasks/src/util.rs b/crates/turbo-tasks/src/util.rs
@@ -38,7 +38,7 @@ impl StdError for SharedError {
         self.inner.source()
     }
 
-    fn provide<'a>(&'a self, req: &mut std::any::Demand<'a>) {
+    fn provide<'a>(&'a self, req: &mut std::error::Request<'a>) {
         self.inner.provide(req);
     }
 }

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-07-21
+nightly-2023-09-21