Update rust-toolchain to 2023-11-16 (vercel#58558)

This updates the rust toolchain to 2023-11-16 and: - Removes now-unnecessary `#![feature(async_fn_in_trait)]` - Applies auto-fixable lint fixes - Uses `Cargo.toml` new `lint` section instead of command line rustc flags Test Plan: Tested with updated turbo in a create-next-app Closes PACK-1979 Co-authored-by: OJ Kwon <[email protected]>
onwidget · Nov 18, 2023 · 024a0ef · 024a0ef
1 parent c0e5d65
commit 024a0ef
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 52 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -34,5 +34,4 @@ rustflags = [
   "tokio_unstable",
   "-Zshare-generics=y",
   "-Csymbol-mangling-version=v0",
-  "-Aclippy::too_many_arguments",
 ]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,6 +14,9 @@ members = [
   "packages/next-swc/crates/next-transform-strip-page-exports",
 ]
 
+[workspace.lints.clippy]
+too_many_arguments = "allow"
+
 # This is a workaround for wasm timeout issue
 [profile.dev.package."*"]
 debug-assertions = false
@@ -40,11 +43,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
 testing = { version = "0.35.7" }
 
 # Turbo crates
-turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231114.2" }
+turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" }
 # [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
-turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231114.2" }
+turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" }
 # [TODO]: need to refactor embed_directory! macro usage in next-core
-turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231114.2" }
+turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" }
 
 # General Deps
 

diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml
@@ -7,6 +7,9 @@ publish = false
 [features]
 plugin = ["turbopack-binding/__swc_core_binding_napi_plugin"]
 
+[lints]
+workspace = true
+
 [dependencies]
 chrono = "0.4"
 convert_case = "0.5.0"

diff --git a/packages/next-swc/crates/core/src/auto_cjs/mod.rs b/packages/next-swc/crates/core/src/auto_cjs/mod.rs
@@ -44,7 +44,7 @@ impl Visit for CjsFinder {
                     (&*member_expr.obj, &member_expr.prop)
                 {
                     if &*obj.sym == "Object" && &*prop.sym == "defineProperty" {
-                        if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.get(0) {
+                        if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.first() {
                             if let Expr::Ident(arg0) = &**expr0 {
                                 if &*arg0.sym == "exports" {
                                     if let Some(ExprOrSpread { expr: expr1, .. }) = e.args.get(1) {

diff --git a/packages/next-swc/crates/core/src/cjs_optimizer.rs b/packages/next-swc/crates/core/src/cjs_optimizer.rs
@@ -216,7 +216,7 @@ impl VisitMut for CjsOptimizer {
         {
             if let Expr::Ident(ident) = &**callee {
                 if ident.span.ctxt == self.unresolved_ctxt && ident.sym == *"require" {
-                    if let Some(arg) = args.get(0) {
+                    if let Some(arg) = args.first() {
                         if let Expr::Lit(Lit::Str(v)) = &*arg.expr {
                             // TODO: Config
 

diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml
@@ -39,6 +39,9 @@ __internal_dhat-heap = ["dhat"]
 # effectively does nothing.
 __internal_dhat-ad-hoc = ["dhat"]
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = "1.0.66"
 backtrace = "0.3"

diff --git a/packages/next-swc/crates/napi/src/lib.rs b/packages/next-swc/crates/napi/src/lib.rs
@@ -29,7 +29,6 @@ DEALINGS IN THE SOFTWARE.
 #![recursion_limit = "2048"]
 //#![deny(clippy::all)]
 #![feature(arbitrary_self_types)]
-#![feature(async_fn_in_trait)]
 
 #[macro_use]
 extern crate napi_derive;

diff --git a/packages/next-swc/crates/next-api/Cargo.toml b/packages/next-swc/crates/next-api/Cargo.toml
@@ -16,6 +16,9 @@ custom_allocator = [
   "turbopack-binding/__turbo_tasks_malloc_custom_allocator",
 ]
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
 futures = { workspace = true }

diff --git a/packages/next-swc/crates/next-api/src/lib.rs b/packages/next-swc/crates/next-api/src/lib.rs
@@ -1,6 +1,5 @@
 #![feature(future_join)]
 #![feature(arbitrary_self_types)]
-#![feature(async_fn_in_trait)]
 
 mod app;
 mod dynamic_imports;