From 024a0ef24d0954b20f5ab0965e6df3ec9075bed3 Mon Sep 17 00:00:00 2001 From: Will Binns-Smith Date: Fri, 17 Nov 2023 16:29:50 -0800 Subject: [PATCH] Update rust-toolchain to 2023-11-16 (#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 <1210596+kwonoj@users.noreply.github.com> --- .cargo/config.toml | 1 - Cargo.lock | 66 +++++++++---------- Cargo.toml | 9 ++- packages/next-swc/crates/core/Cargo.toml | 3 + .../next-swc/crates/core/src/auto_cjs/mod.rs | 2 +- .../next-swc/crates/core/src/cjs_optimizer.rs | 2 +- packages/next-swc/crates/napi/Cargo.toml | 3 + packages/next-swc/crates/napi/src/lib.rs | 1 - packages/next-swc/crates/next-api/Cargo.toml | 3 + packages/next-swc/crates/next-api/src/lib.rs | 1 - .../next-swc/crates/next-build/Cargo.toml | 3 + .../next-swc/crates/next-build/src/lib.rs | 1 - packages/next-swc/crates/next-core/Cargo.toml | 3 + packages/next-swc/crates/next-core/src/lib.rs | 1 - .../crates/next-core/src/next_image/mod.rs | 1 - .../crates/next-transform-dynamic/Cargo.toml | 3 + .../crates/next-transform-font/Cargo.toml | 3 + .../src/font_imports_generator.rs | 2 +- .../Cargo.toml | 3 + packages/next-swc/crates/wasm/Cargo.toml | 3 + rust-toolchain | 2 +- scripts/send-trace-to-jaeger/Cargo.toml | 3 + test/turbopack-tests-manifest.json | 12 ++-- 23 files changed, 79 insertions(+), 52 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 48a22abd21..a38223d24f 100644 --- 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 index bc26940c17..bc9811ebae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -322,7 +322,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "serde", "smallvec", @@ -3542,7 +3542,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "serde", @@ -7688,7 +7688,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-trait", @@ -7720,7 +7720,7 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "cargo-lock", @@ -7732,7 +7732,7 @@ dependencies = [ [[package]] name = "turbo-tasks-bytes" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "bytes", @@ -7747,7 +7747,7 @@ dependencies = [ [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "dotenvs", @@ -7761,7 +7761,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7778,7 +7778,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "auto-hash-map", @@ -7808,7 +7808,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "base16", "hex", @@ -7820,7 +7820,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7834,7 +7834,7 @@ dependencies = [ [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "proc-macro2", "quote", @@ -7844,7 +7844,7 @@ dependencies = [ [[package]] name = "turbo-tasks-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "mimalloc", ] @@ -7852,7 +7852,7 @@ dependencies = [ [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "auto-hash-map", @@ -7877,7 +7877,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-recursion", @@ -7908,7 +7908,7 @@ dependencies = [ [[package]] name = "turbopack-binding" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "auto-hash-map", "mdxjs", @@ -7948,7 +7948,7 @@ dependencies = [ [[package]] name = "turbopack-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -7971,7 +7971,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "clap 4.4.2", @@ -7995,7 +7995,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-recursion", @@ -8025,7 +8025,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-trait", @@ -8047,7 +8047,7 @@ dependencies = [ [[package]] name = "turbopack-dev" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8071,7 +8071,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-compression", @@ -8108,7 +8108,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-trait", @@ -8142,7 +8142,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-hmr-protocol" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "serde", "serde_json", @@ -8153,7 +8153,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-plugins" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-trait", @@ -8176,7 +8176,7 @@ dependencies = [ [[package]] name = "turbopack-ecmascript-runtime" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "indoc", @@ -8193,7 +8193,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -8209,7 +8209,7 @@ dependencies = [ [[package]] name = "turbopack-image" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "base64 0.21.4", @@ -8229,7 +8229,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "serde", @@ -8244,7 +8244,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "mdxjs", @@ -8259,7 +8259,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "async-stream", @@ -8294,7 +8294,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "serde", @@ -8310,7 +8310,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "swc_core", "turbo-tasks", @@ -8321,7 +8321,7 @@ dependencies = [ [[package]] name = "turbopack-wasm" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231114.2#1ef08ff2e83699315f7754b6bc9509a892cd1387" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-231117.4#cbf9b8c30b0ca011ced952ed3e77ef9a53905095" dependencies = [ "anyhow", "indexmap 1.9.3", diff --git a/Cargo.toml b/Cargo.toml index 34c042b117..5c989424d0 100644 --- 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 index 3db833052f..990799d2c6 100644 --- 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 index 9e357f5470..4ccf5f9644 100644 --- 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 index 53a0a1b3a5..af22057ac6 100644 --- 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 index 303a3afb41..9af0579244 100644 --- 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 index 79ead3d3aa..24dbf88cc0 100644 --- 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 index dbb94efdb3..c0d8796bcc 100644 --- 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 index 0e7d7c7b04..299adf0a06 100644 --- 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; diff --git a/packages/next-swc/crates/next-build/Cargo.toml b/packages/next-swc/crates/next-build/Cargo.toml index 146b2eb341..4c96408a40 100644 --- a/packages/next-swc/crates/next-build/Cargo.toml +++ b/packages/next-swc/crates/next-build/Cargo.toml @@ -30,6 +30,9 @@ custom_allocator = [ serializable = [] profile = [] +[lints] +workspace = true + [dependencies] anyhow = { workspace = true } async-recursion = { workspace = true } diff --git a/packages/next-swc/crates/next-build/src/lib.rs b/packages/next-swc/crates/next-build/src/lib.rs index afe7ef263d..89f547c227 100644 --- a/packages/next-swc/crates/next-build/src/lib.rs +++ b/packages/next-swc/crates/next-build/src/lib.rs @@ -1,6 +1,5 @@ #![feature(type_alias_impl_trait)] #![feature(arbitrary_self_types)] -#![feature(async_fn_in_trait)] use turbopack_binding::turbo::{ tasks::{run_once, TransientInstance, TurboTasks}, diff --git a/packages/next-swc/crates/next-core/Cargo.toml b/packages/next-swc/crates/next-core/Cargo.toml index 16606e9a9b..17bb9cbd20 100644 --- a/packages/next-swc/crates/next-core/Cargo.toml +++ b/packages/next-swc/crates/next-core/Cargo.toml @@ -8,6 +8,9 @@ edition = "2021" [lib] bench = false +[lints] +workspace = true + [dependencies] anyhow = { workspace = true } async-recursion = { workspace = true } diff --git a/packages/next-swc/crates/next-core/src/lib.rs b/packages/next-swc/crates/next-core/src/lib.rs index 52248f6af8..1eff791f9a 100644 --- a/packages/next-swc/crates/next-core/src/lib.rs +++ b/packages/next-swc/crates/next-core/src/lib.rs @@ -4,7 +4,6 @@ #![feature(str_split_remainder)] #![feature(impl_trait_in_assoc_type)] #![feature(arbitrary_self_types)] -#![feature(async_fn_in_trait)] mod app_segment_config; pub mod app_structure; diff --git a/packages/next-swc/crates/next-core/src/next_image/mod.rs b/packages/next-swc/crates/next-core/src/next_image/mod.rs index 2ba7439ac3..f330d5272c 100644 --- a/packages/next-swc/crates/next-core/src/next_image/mod.rs +++ b/packages/next-swc/crates/next-core/src/next_image/mod.rs @@ -2,5 +2,4 @@ pub(crate) mod content_source; pub(crate) mod module; pub(crate) mod source_asset; -pub use content_source::NextImageContentSource; pub use module::StructuredImageModuleType; diff --git a/packages/next-swc/crates/next-transform-dynamic/Cargo.toml b/packages/next-swc/crates/next-transform-dynamic/Cargo.toml index 64bd8df45d..f5291a18e7 100644 --- a/packages/next-swc/crates/next-transform-dynamic/Cargo.toml +++ b/packages/next-swc/crates/next-transform-dynamic/Cargo.toml @@ -9,6 +9,9 @@ autobenches = false [lib] bench = false +[lints] +workspace = true + [dependencies] pathdiff = { workspace = true } diff --git a/packages/next-swc/crates/next-transform-font/Cargo.toml b/packages/next-swc/crates/next-transform-font/Cargo.toml index 99e42fe17d..cbc87f9099 100644 --- a/packages/next-swc/crates/next-transform-font/Cargo.toml +++ b/packages/next-swc/crates/next-transform-font/Cargo.toml @@ -8,6 +8,9 @@ edition = "2021" [lib] bench = false +[lints] +workspace = true + [dependencies] rustc-hash = { workspace = true } serde = { workspace = true } diff --git a/packages/next-swc/crates/next-transform-font/src/font_imports_generator.rs b/packages/next-swc/crates/next-transform-font/src/font_imports_generator.rs index 644c1b182b..4d1af234b3 100644 --- a/packages/next-swc/crates/next-transform-font/src/font_imports_generator.rs +++ b/packages/next-swc/crates/next-transform-font/src/font_imports_generator.rs @@ -87,7 +87,7 @@ impl<'a> FontImportsGenerator<'a> { } fn check_var_decl(&mut self, var_decl: &VarDecl) -> Option { - if let Some(decl) = var_decl.decls.get(0) { + if let Some(decl) = var_decl.decls.first() { let ident = match &decl.name { Pat::Ident(ident) => Ok(ident.id.clone()), pattern => Err(pattern), diff --git a/packages/next-swc/crates/next-transform-strip-page-exports/Cargo.toml b/packages/next-swc/crates/next-transform-strip-page-exports/Cargo.toml index abff73781f..0baac01531 100644 --- a/packages/next-swc/crates/next-transform-strip-page-exports/Cargo.toml +++ b/packages/next-swc/crates/next-transform-strip-page-exports/Cargo.toml @@ -9,6 +9,9 @@ autobenches = false [lib] bench = false +[lints] +workspace = true + [dependencies] rustc-hash = { workspace = true } tracing = { workspace = true } diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index c05f4bd1f4..01f2d2bc86 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -13,6 +13,9 @@ swc_v1 = [] plugin = ["getrandom/js", "turbopack-binding/__swc_core_binding_wasm_plugin"] +[lints] +workspace = true + [dependencies] anyhow = "1.0.66" console_error_panic_hook = "0.1.6" diff --git a/rust-toolchain b/rust-toolchain index 38686d9d69..1d77724c9b 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-10-06 +nightly-2023-11-16 diff --git a/scripts/send-trace-to-jaeger/Cargo.toml b/scripts/send-trace-to-jaeger/Cargo.toml index cf5013c367..3ce726e52c 100644 --- a/scripts/send-trace-to-jaeger/Cargo.toml +++ b/scripts/send-trace-to-jaeger/Cargo.toml @@ -6,6 +6,9 @@ publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lints] +workspace = true + [dependencies] serde_json = "1.0.59" reqwest = { version = "0.11.6", features = ["blocking"] } \ No newline at end of file diff --git a/test/turbopack-tests-manifest.json b/test/turbopack-tests-manifest.json index fb21bd4b84..8dc5baa3cd 100644 --- a/test/turbopack-tests-manifest.json +++ b/test/turbopack-tests-manifest.json @@ -3355,7 +3355,6 @@ "app dir - metadata dynamic routes should use localhost for local prod and fallback to deployment url when metadataBase is falsy", "app dir - metadata dynamic routes social image routes should fill params into dynamic routes url of metadata images", "app dir - metadata dynamic routes social image routes should fill params into routes groups url of static images", - "app dir - metadata dynamic routes social image routes should handle custom fonts in both edge and nodejs runtime", "app dir - metadata dynamic routes social image routes should handle manifest.[ext] dynamic routes", "app dir - metadata dynamic routes social image routes should render og image with opengraph-image dynamic routes", "app dir - metadata dynamic routes social image routes should render og image with twitter-image dynamic routes", @@ -3367,7 +3366,8 @@ "app dir - metadata dynamic routes text routes should not throw if client components are imported but not used" ], "failed": [ - "app dir - metadata dynamic routes should error if the default export of dynamic image is missing" + "app dir - metadata dynamic routes should error if the default export of dynamic image is missing", + "app dir - metadata dynamic routes social image routes should handle custom fonts in both edge and nodejs runtime" ], "pending": [], "flakey": [], @@ -14881,16 +14881,16 @@ }, "test/integration/url/test/index.test.js": { "passed": [ - "Handle new URL asset references in next dev should client-render the /ssg page", - "Handle new URL asset references in next dev should client-render the /ssr page", "Handle new URL asset references in next dev should client-render the /static page", "Handle new URL asset references in next dev should render the /ssg page", "Handle new URL asset references in next dev should render the /ssr page", "Handle new URL asset references in next dev should render the /static page", - "Handle new URL asset references in next dev should respond on basename api" + "Handle new URL asset references in next dev should respond on basename api", + "Handle new URL asset references in next dev should respond on size api" ], "failed": [ - "Handle new URL asset references in next dev should respond on size api" + "Handle new URL asset references in next dev should client-render the /ssg page", + "Handle new URL asset references in next dev should client-render the /ssr page" ], "pending": [ "Handle new URL asset references in next build should client-render the /ssg page",