Skip to content

Commit

Permalink
Merge branch 'canary' into mischnic/client-ref-async
Browse files Browse the repository at this point in the history
  • Loading branch information
mischnic committed Sep 24, 2024
2 parents 9d31f25 + f57cada commit 650deec
Show file tree
Hide file tree
Showing 737 changed files with 15,418 additions and 10,181 deletions.
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@
"RUST_BACKTRACE": "0"
},
"cSpell.words": [
"Destructuring",
"Entrypoints",
"jscodeshift",
"napi",
"nextjs",
"opentelemetry",
Expand Down
19 changes: 0 additions & 19 deletions Cargo.lock

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

8 changes: 0 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ tungstenite = "0.20.1"

# flate2_zlib requires zlib, use flate2_rust
allsorts = { version = "0.14.0", default-features = false, features = [
"outline",
"flate2_rust",
] }
anyhow = "1.0.69"
Expand Down Expand Up @@ -169,8 +168,6 @@ owo-colors = "3.5.0"
parcel_selectors = "0.27.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"
petgraph = "0.6.3"
pin-project-lite = "0.2.9"
postcard = "1.0.4"
Expand Down Expand Up @@ -216,8 +213,3 @@ unsize = "1.1.0"
url = "2.2.2"
urlencoding = "2.1.2"
webbrowser = "0.8.7"

# Sync with the entries in turbo's Cargo.toml
[patch.crates-io]
# TODO: Use upstream when https://github.com/servo/pathfinder/pull/566 lands
pathfinder_simd = { git = "https://github.com/vercel/pathfinder", branch = "rm-stdarch_arm_crc32"}
Loading

0 comments on commit 650deec

Please sign in to comment.