Skip to content

Commit dedf6d3

Browse files
authored
Revert Rust upgrade to nightly-2025-04-10 (vercel#78062)
Reverts most of vercel#78039, I've kept the applied clippy suggestions though. Unfortunately, a rustc ICE crash that was rare before now happens constantly, both when building and inside rust-analyzer, making everything just unusable.
1 parent 1dccfbc commit dedf6d3

File tree

9 files changed

+16
-12
lines changed

9 files changed

+16
-12
lines changed

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2025-04-10"
2+
channel = "nightly-2025-02-12"
33
components = ["rustfmt", "clippy", "rust-analyzer"]
44
profile = "minimal"

turbopack/crates/turbo-static/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@ fn resolve_concurrency(
194194

195195
for (ident, references) in dep_tree {
196196
for reference in references {
197-
#[allow(clippy::map_entry)] // This doesn't insert into dep_tree, so entry isn't useful
198197
if !dep_tree.contains_key(&reference.identifier) {
199198
// this is a task that is not in the task list
200199
// so we can't resolve it

turbopack/crates/turbo-tasks-auto-hash-map/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![feature(hash_extract_if)]
2+
13
pub mod map;
24
pub mod set;
35

turbopack/crates/turbo-tasks-fs/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
22
#![feature(trivial_bounds)]
3+
#![feature(hash_extract_if)]
34
#![feature(min_specialization)]
45
#![feature(iter_advance_by)]
56
#![feature(io_error_more)]

turbopack/crates/turbo-tasks-macros-tests/tests/function/fail_operation_method_self_type.stderr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@ error: methods taking `self` are not supported with `operation`
44
13 | fn arbitrary_self_type(self: OperationVc<Self>) -> Vc<()> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66

7-
error[E0307]: invalid `self` parameter type: `OperationVc<Foobar>`
8-
--> tests/function/fail_operation_method_self_type.rs:13:34
9-
|
10-
13 | fn arbitrary_self_type(self: OperationVc<Self>) -> Vc<()> {
11-
| ^^^^^^^^^^^^^^^^^
12-
|
13-
= note: type of `self` must be `Self` or some type implementing `Receiver`
14-
= help: consider changing to `self`, `&self`, `&mut self`, or a type implementing `Receiver` such as `self: Box<Self>`, `self: Rc<Self>`, or `self: Arc<Self>`
15-
167
error[E0277]: the trait bound `fn(...) -> ... {...::arbitrary_self_type_turbo_tasks_function_inline}: IntoTaskFnWithThis<_, _, _>` is not satisfied
178
--> tests/function/fail_operation_method_self_type.rs:10:1
189
|
@@ -31,3 +22,12 @@ note: required by a bound in `NativeFunction::new_method`
3122
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `NativeFunction::new_method`
3223
= note: consider using `--verbose` to print the full type name to the console
3324
= note: this error originates in the attribute macro `turbo_tasks::value_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
25+
26+
error[E0307]: invalid `self` parameter type: `OperationVc<Foobar>`
27+
--> tests/function/fail_operation_method_self_type.rs:13:34
28+
|
29+
13 | fn arbitrary_self_type(self: OperationVc<Self>) -> Vc<()> {
30+
| ^^^^^^^^^^^^^^^^^
31+
|
32+
= note: type of `self` must be `Self` or some type implementing `Receiver`
33+
= help: consider changing to `self`, `&self`, `&mut self`, or a type implementing `Receiver` such as `self: Box<Self>`, `self: Rc<Self>`, or `self: Arc<Self>`

turbopack/crates/turbo-tasks-memory/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![feature(hash_extract_if)]
12
#![feature(type_alias_impl_trait)]
23
#![feature(box_patterns)]
34
#![feature(int_roundings)]

turbopack/crates/turbo-tasks/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#![feature(trivial_bounds)]
3030
#![feature(min_specialization)]
3131
#![feature(try_trait_v2)]
32+
#![feature(hash_extract_if)]
3233
#![deny(unsafe_op_in_unsafe_fn)]
3334
#![feature(result_flattening)]
3435
#![feature(error_generic_member_access)]

turbopack/crates/turbopack-css/src/process.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ impl StyleSheetLike<'_, '_> {
112112
pub struct UnresolvedUrlReferences(pub Vec<(String, ResolvedVc<UrlAssetReference>)>);
113113

114114
#[turbo_tasks::value(shared, serialization = "none", eq = "manual", cell = "new")]
115-
#[allow(clippy::large_enum_variant)] // This is a turbo-tasks value
116115
pub enum ParseCssResult {
117116
Ok {
118117
code: ResolvedVc<FileContent>,

turbopack/crates/turbopack-node/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![feature(min_specialization)]
22
#![feature(arbitrary_self_types)]
33
#![feature(arbitrary_self_types_pointers)]
4+
#![feature(extract_if)]
45

56
use std::{iter::once, thread::available_parallelism};
67

0 commit comments

Comments
 (0)