Skip to content

Commit 024a0ef

Browse files
wbinnssmithkwonoj
andauthored
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]>
1 parent c0e5d65 commit 024a0ef

File tree

23 files changed

+79
-52
lines changed

23 files changed

+79
-52
lines changed

.cargo/config.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,4 @@ rustflags = [
3434
"tokio_unstable",
3535
"-Zshare-generics=y",
3636
"-Csymbol-mangling-version=v0",
37-
"-Aclippy::too_many_arguments",
3837
]

Cargo.lock

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ members = [
1414
"packages/next-swc/crates/next-transform-strip-page-exports",
1515
]
1616

17+
[workspace.lints.clippy]
18+
too_many_arguments = "allow"
19+
1720
# This is a workaround for wasm timeout issue
1821
[profile.dev.package."*"]
1922
debug-assertions = false
@@ -40,11 +43,11 @@ next-transform-strip-page-exports = { path = "packages/next-swc/crates/next-tran
4043
testing = { version = "0.35.7" }
4144

4245
# Turbo crates
43-
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231114.2" }
46+
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" }
4447
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
45-
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231114.2" }
48+
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" }
4649
# [TODO]: need to refactor embed_directory! macro usage in next-core
47-
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231114.2" }
50+
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-231117.4" }
4851

4952
# General Deps
5053

packages/next-swc/crates/core/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ publish = false
77
[features]
88
plugin = ["turbopack-binding/__swc_core_binding_napi_plugin"]
99

10+
[lints]
11+
workspace = true
12+
1013
[dependencies]
1114
chrono = "0.4"
1215
convert_case = "0.5.0"

packages/next-swc/crates/core/src/auto_cjs/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl Visit for CjsFinder {
4444
(&*member_expr.obj, &member_expr.prop)
4545
{
4646
if &*obj.sym == "Object" && &*prop.sym == "defineProperty" {
47-
if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.get(0) {
47+
if let Some(ExprOrSpread { expr: expr0, .. }) = e.args.first() {
4848
if let Expr::Ident(arg0) = &**expr0 {
4949
if &*arg0.sym == "exports" {
5050
if let Some(ExprOrSpread { expr: expr1, .. }) = e.args.get(1) {

packages/next-swc/crates/core/src/cjs_optimizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl VisitMut for CjsOptimizer {
216216
{
217217
if let Expr::Ident(ident) = &**callee {
218218
if ident.span.ctxt == self.unresolved_ctxt && ident.sym == *"require" {
219-
if let Some(arg) = args.get(0) {
219+
if let Some(arg) = args.first() {
220220
if let Expr::Lit(Lit::Str(v)) = &*arg.expr {
221221
// TODO: Config
222222

packages/next-swc/crates/napi/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ __internal_dhat-heap = ["dhat"]
3939
# effectively does nothing.
4040
__internal_dhat-ad-hoc = ["dhat"]
4141

42+
[lints]
43+
workspace = true
44+
4245
[dependencies]
4346
anyhow = "1.0.66"
4447
backtrace = "0.3"

packages/next-swc/crates/napi/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ DEALINGS IN THE SOFTWARE.
2929
#![recursion_limit = "2048"]
3030
//#![deny(clippy::all)]
3131
#![feature(arbitrary_self_types)]
32-
#![feature(async_fn_in_trait)]
3332

3433
#[macro_use]
3534
extern crate napi_derive;

packages/next-swc/crates/next-api/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ custom_allocator = [
1616
"turbopack-binding/__turbo_tasks_malloc_custom_allocator",
1717
]
1818

19+
[lints]
20+
workspace = true
21+
1922
[dependencies]
2023
anyhow = { workspace = true, features = ["backtrace"] }
2124
futures = { workspace = true }

packages/next-swc/crates/next-api/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(future_join)]
22
#![feature(arbitrary_self_types)]
3-
#![feature(async_fn_in_trait)]
43

54
mod app;
65
mod dynamic_imports;

0 commit comments

Comments
 (0)