Skip to content

Commit f987de0

Browse files
authored
Update rust toolchain to nightly-2023-09-21 (vercel/turborepo#6002)
This: - Updates to the latest api change for `StdError` in `error_generic_member_access` rust-lang/rust#99301 - Updates `pathfinder_simd` for compatiblity - Updates other crates for compatibility with Next.js Closes WEB-1635
1 parent bad99c6 commit f987de0

File tree

11 files changed

+36
-42
lines changed

11 files changed

+36
-42
lines changed

Diff for: crates/turbo-tasks-macros/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![allow(internal_features)]
12
#![feature(proc_macro_diagnostic)]
23
#![feature(allow_internal_unstable)]
34
#![feature(box_patterns)]

Diff for: crates/turbo-tasks/src/backend.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{
22
any::Any,
33
borrow::Cow,
44
fmt,
5-
fmt::{Debug, Display},
5+
fmt::{Debug, Display, Write},
66
future::Future,
77
pin::Pin,
88
sync::Arc,
@@ -383,11 +383,14 @@ impl PersistentTaskType {
383383
}
384384
Err(name) => {
385385
if !this_value.has_trait(trait_type) {
386-
let traits = this_value
387-
.traits()
388-
.iter()
389-
.map(|t| format!(" {}", t))
390-
.collect::<String>();
386+
let traits =
387+
this_value
388+
.traits()
389+
.iter()
390+
.fold(String::new(), |mut out, t| {
391+
let _ = write!(out, " {}", t);
392+
out
393+
});
391394
Err(anyhow!(
392395
"{} doesn't implement {} (only{})",
393396
this_value,

Diff for: crates/turbo-tasks/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#![deny(unsafe_op_in_unsafe_fn)]
3030
#![feature(result_flattening)]
3131
#![feature(error_generic_member_access)]
32-
#![feature(provide_any)]
3332
#![feature(new_uninit)]
3433
#![feature(arbitrary_self_types)]
3534
#![feature(async_fn_in_trait)]

Diff for: crates/turbo-tasks/src/manager.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ pub fn with_turbo_tasks<T>(func: impl FnOnce(&Arc<dyn TurboTasksApi>) -> T) -> T
13411341
}
13421342

13431343
pub fn weak_turbo_tasks() -> Weak<dyn TurboTasksApi> {
1344-
TURBO_TASKS.with(|arc| Arc::downgrade(arc))
1344+
TURBO_TASKS.with(Arc::downgrade)
13451345
}
13461346

13471347
pub fn with_turbo_tasks_for_testing<T>(

Diff for: crates/turbo-tasks/src/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl StdError for SharedError {
3838
self.inner.source()
3939
}
4040

41-
fn provide<'a>(&'a self, req: &mut std::any::Demand<'a>) {
41+
fn provide<'a>(&'a self, req: &mut std::error::Request<'a>) {
4242
self.inner.provide(req);
4343
}
4444
}

Diff for: crates/turbopack-cli-utils/src/issue.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -397,15 +397,9 @@ impl IssueReporter for ConsoleUi {
397397
let category = &plain_issue.category;
398398
let title = &plain_issue.title;
399399
let processing_path = &*plain_issue.processing_path;
400-
let severity_map = grouped_issues
401-
.entry(severity)
402-
.or_insert_with(Default::default);
403-
let category_map = severity_map
404-
.entry(category.clone())
405-
.or_insert_with(Default::default);
406-
let issues = category_map
407-
.entry(context_path.to_string())
408-
.or_insert_with(Default::default);
400+
let severity_map = grouped_issues.entry(severity).or_default();
401+
let category_map = severity_map.entry(category.clone()).or_default();
402+
let issues = category_map.entry(context_path.to_string()).or_default();
409403

410404
let mut styled_issue = if let Some(source) = &plain_issue.source {
411405
let mut styled_issue = format!(

Diff for: crates/turbopack-convert-trace/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ fn main() {
599599
);
600600
add_to_span_counter();
601601
} else {
602-
let group = groups.entry(key).or_insert_with(Vec::new);
602+
let group = groups.entry(key).or_default();
603603
if !group.is_empty() {
604604
add_to_span_counter();
605605
}

Diff for: crates/turbopack-core/src/issue/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ impl CapturedIssues {
391391
})
392392
.try_join()
393393
.await?;
394-
list.sort_by(|a, b| ReadRef::ptr_cmp(a, b));
394+
list.sort_by(ReadRef::ptr_cmp);
395395
Ok(list)
396396
}
397397
}

Diff for: crates/turbopack-dev/src/ecmascript/list/content.rs

+9-12
Original file line numberDiff line numberDiff line change
@@ -93,18 +93,15 @@ impl EcmascriptDevChunkListContent {
9393

9494
let by_merger = by_merger
9595
.into_iter()
96-
.map(|(merger, contents)| {
97-
let merger = merger;
98-
async move {
99-
Ok((
100-
merger,
101-
merger
102-
.merge(Vc::cell(contents))
103-
.version()
104-
.into_trait_ref()
105-
.await?,
106-
))
107-
}
96+
.map(|(merger, contents)| async move {
97+
Ok((
98+
merger,
99+
merger
100+
.merge(Vc::cell(contents))
101+
.version()
102+
.into_trait_ref()
103+
.await?,
104+
))
108105
})
109106
.try_join()
110107
.await?

Diff for: crates/turbopack-ecmascript/src/analyzer/mod.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use std::{
44
borrow::Cow,
55
cmp::Ordering,
6-
fmt::Display,
6+
fmt::{Display, Write},
77
future::Future,
88
hash::{Hash, Hasher},
99
mem::take,
@@ -1044,10 +1044,10 @@ impl JsValue {
10441044
let explainer = pretty_join(&args, 0, ", ", ",", "");
10451045
(
10461046
explainer,
1047-
hints
1048-
.into_iter()
1049-
.map(|h| format!("\n{h}"))
1050-
.collect::<String>(),
1047+
hints.into_iter().fold(String::new(), |mut out, h| {
1048+
let _ = write!(out, "\n{h}");
1049+
out
1050+
}),
10511051
)
10521052
}
10531053

@@ -1056,10 +1056,10 @@ impl JsValue {
10561056
let explainer = self.explain_internal(&mut hints, 0, depth, unknown_depth);
10571057
(
10581058
explainer,
1059-
hints
1060-
.into_iter()
1061-
.map(|h| format!("\n{h}"))
1062-
.collect::<String>(),
1059+
hints.into_iter().fold(String::new(), |mut out, h| {
1060+
let _ = write!(out, "\n{h}");
1061+
out
1062+
}),
10631063
)
10641064
}
10651065

Diff for: xtask/src/publish.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ pub fn run_bump(names: HashSet<String>, dry_run: bool) {
249249
.collect::<Vec<PackageJson>>();
250250
let mut workspaces_to_bump = workspaces
251251
.iter()
252+
.filter(|&p| names.contains(&p.name))
252253
.cloned()
253-
.filter(|p| names.contains(&p.name))
254254
.collect::<Vec<_>>();
255255
if workspaces_to_bump.is_empty() {
256256
fn name_to_title(package: &PackageJson) -> String {

0 commit comments

Comments
 (0)