Skip to content

Commit

Permalink
Update rust-toolchain to nightly-2024-04-03 (vercel#64048)
Browse files Browse the repository at this point in the history
Depends on vercel/turborepo#7874, which should be
merged first.

Test Plan: `cargo check`


Closes PACK-2903
  • Loading branch information
wbinnssmith authored Apr 4, 2024
1 parent 710cf7c commit 3d3311b
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 66 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,15 @@ jobs:
test-next-swc-napi-wasi:
name: test next-swc wasi
needs: ['changes', 'build-next']
if: ${{ needs.changes.outputs.docs-only == 'false' }}
# TODO: Re-enable this when https://github.com/napi-rs/napi-rs/issues/2009 is addressed.
# Specifically, the `platform` value is now `threads` in
# https://github.com/napi-rs/napi-rs/blob/e4ad4767efaf093fdff3dc768856f6100a6e3f72/cli/src/api/build.ts#L530
if: false
# if: ${{ needs.changes.outputs.docs-only == 'false' }}

uses: ./.github/workflows/build_reusable.yml
with:
afterBuild: rustup target add wasm32-wasi-preview1-threads && turbo run build-native-wasi
afterBuild: rustup target add wasm32-wasip1-threads && turbo run build-native-wasi
stepName: 'test-next-swc-napi-wasi'
secrets: inherit

Expand Down
75 changes: 37 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ swc_core = { version = "0.90.24", features = [
testing = { version = "0.35.21" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240329.2" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
# [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-240329.2" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240329.2" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-240404.2" }

# General Deps

Expand Down Expand Up @@ -105,6 +105,8 @@ owo-colors = "3.5.0"
parcel_selectors = "0.26.0"
parking_lot = "0.12.1"
pathdiff = "0.2.1"
# Temporary: Reference the latest git minor version of pathfinder_simd until it's published.
pathfinder_simd = "0.5.3"
pin-project-lite = "0.2.9"
postcard = "1.0.4"
predicates = "2.1.5"
Expand Down Expand Up @@ -137,3 +139,6 @@ urlencoding = "2.1.2"
webbrowser = "0.8.7"
dhat = { version = "0.3.2" }

# Sync with the entries in turbo's Cargo.toml
[patch.crates-io]
pathfinder_simd = { git = "https://github.com/servo/pathfinder", rev = "30419d" }
2 changes: 1 addition & 1 deletion packages/next-swc/crates/napi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ turbopack-binding = { workspace = true, features = [
] }

# wasi-only dependencies.
[target.wasm32-wasi-preview1-threads.dependencies]
[target.wasm32-wasip1-threads.dependencies]
# this requires tokio_unstable currently.
tokio = { workspace = true, features = ["full"] }

Expand Down
2 changes: 1 addition & 1 deletion packages/next-swc/crates/napi/src/turbopack.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::{convert::TryFrom, path::PathBuf};
use std::path::PathBuf;

use anyhow::Context;
use napi::bindgen_prelude::*;
Expand Down
2 changes: 0 additions & 2 deletions packages/next-swc/crates/next-core/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// TODO(alexkirsz) Remove once the diagnostic is fixed.
#![allow(rustc::untranslatable_diagnostic_trivial)]
#![feature(async_closure)]
#![feature(str_split_remainder)]
#![feature(impl_trait_in_assoc_type)]
Expand Down
Loading

0 comments on commit 3d3311b

Please sign in to comment.