Unverified Commit dedf6d3a authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Revert Rust upgrade to nightly-2025-04-10 (#78062)

Reverts most of #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.
parent 1dccfbce
[toolchain]
channel = "nightly-2025-04-10"
channel = "nightly-2025-02-12"
components = ["rustfmt", "clippy", "rust-analyzer"]
profile = "minimal"
......@@ -194,7 +194,6 @@ fn resolve_concurrency(
for (ident, references) in dep_tree {
for reference in references {
#[allow(clippy::map_entry)] // This doesn't insert into dep_tree, so entry isn't useful
if !dep_tree.contains_key(&reference.identifier) {
// this is a task that is not in the task list
// so we can't resolve it
......
#![feature(hash_extract_if)]
pub mod map;
pub mod set;
......
#![allow(clippy::needless_return)] // tokio macro-generated code doesn't respect this
#![feature(trivial_bounds)]
#![feature(hash_extract_if)]
#![feature(min_specialization)]
#![feature(iter_advance_by)]
#![feature(io_error_more)]
......
......@@ -4,15 +4,6 @@ error: methods taking `self` are not supported with `operation`
13 | fn arbitrary_self_type(self: OperationVc<Self>) -> Vc<()> {
| ^^^^^^^^^^^^^^^^^^^^^^^
error[E0307]: invalid `self` parameter type: `OperationVc<Foobar>`
--> tests/function/fail_operation_method_self_type.rs:13:34
|
13 | fn arbitrary_self_type(self: OperationVc<Self>) -> Vc<()> {
| ^^^^^^^^^^^^^^^^^
|
= note: type of `self` must be `Self` or some type implementing `Receiver`
= 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>`
error[E0277]: the trait bound `fn(...) -> ... {...::arbitrary_self_type_turbo_tasks_function_inline}: IntoTaskFnWithThis<_, _, _>` is not satisfied
--> tests/function/fail_operation_method_self_type.rs:10:1
|
......@@ -31,3 +22,12 @@ note: required by a bound in `NativeFunction::new_method`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `NativeFunction::new_method`
= note: consider using `--verbose` to print the full type name to the console
= note: this error originates in the attribute macro `turbo_tasks::value_impl` (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0307]: invalid `self` parameter type: `OperationVc<Foobar>`
--> tests/function/fail_operation_method_self_type.rs:13:34
|
13 | fn arbitrary_self_type(self: OperationVc<Self>) -> Vc<()> {
| ^^^^^^^^^^^^^^^^^
|
= note: type of `self` must be `Self` or some type implementing `Receiver`
= 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>`
#![feature(hash_extract_if)]
#![feature(type_alias_impl_trait)]
#![feature(box_patterns)]
#![feature(int_roundings)]
......
......@@ -29,6 +29,7 @@
#![feature(trivial_bounds)]
#![feature(min_specialization)]
#![feature(try_trait_v2)]
#![feature(hash_extract_if)]
#![deny(unsafe_op_in_unsafe_fn)]
#![feature(result_flattening)]
#![feature(error_generic_member_access)]
......
......@@ -112,7 +112,6 @@ impl StyleSheetLike<'_, '_> {
pub struct UnresolvedUrlReferences(pub Vec<(String, ResolvedVc<UrlAssetReference>)>);
#[turbo_tasks::value(shared, serialization = "none", eq = "manual", cell = "new")]
#[allow(clippy::large_enum_variant)] // This is a turbo-tasks value
pub enum ParseCssResult {
Ok {
code: ResolvedVc<FileContent>,
......
#![feature(min_specialization)]
#![feature(arbitrary_self_types)]
#![feature(arbitrary_self_types_pointers)]
#![feature(extract_if)]
use std::{iter::once, thread::available_parallelism};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment