Skip to content

Commit 37df9ab

Browse files
authored
Upgrade to rustc nightly-2024-08-01 (#68452)
1. Upgrade to `nightly-2024-08-01` 2. Fix lints 3. Remove some unused structs 4. Bump `regex` because of rust-lang/regex#1219 Closes PACK-3178
1 parent 723e0cc commit 37df9ab

File tree

17 files changed

+15
-45
lines changed

17 files changed

+15
-45
lines changed

Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ proc-macro2 = "1.0.79"
184184
qstring = "0.7.2"
185185
quote = "1.0.23"
186186
rand = "0.8.5"
187-
regex = "1.7.0"
187+
regex = "1.10.6"
188188
rstest = "0.16.0"
189189
rustc-hash = "1.1.0"
190190
semver = "1.0.16"

crates/next-core/src/next_config.rs

-17
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,12 @@ use crate::{
2828
next_import_map::mdx_import_source_file, next_shared::transforms::ModularizeImportPackageConfig,
2929
};
3030

31-
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
32-
#[serde(rename_all = "camelCase")]
33-
struct NextConfigAndCustomRoutesRaw {
34-
config: NextConfig,
35-
custom_routes: CustomRoutesRaw,
36-
}
37-
3831
#[turbo_tasks::value]
3932
struct NextConfigAndCustomRoutes {
4033
config: Vc<NextConfig>,
4134
custom_routes: Vc<CustomRoutes>,
4235
}
4336

44-
#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
45-
#[serde(rename_all = "camelCase")]
46-
struct CustomRoutesRaw {
47-
rewrites: Rewrites,
48-
49-
// unsupported
50-
headers: Vec<Header>,
51-
redirects: Vec<Redirect>,
52-
}
53-
5437
#[turbo_tasks::value]
5538
struct CustomRoutes {
5639
rewrites: Vc<Rewrites>,

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2024-05-31"
2+
channel = "nightly-2024-08-01"
33
components = ["rustfmt", "clippy"]
44
profile = "minimal"

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ impl<'a> CallResolver<'a> {
4141
bincode::deserialize_from::<_, HashMap<Identifier, Vec<IdentifierReference>>>(
4242
reader,
4343
)
44-
.map_err(|e| {
44+
.inspect_err(|_| {
4545
tracing::warn!("failed to load existing cache, restarting");
46-
e
4746
})
4847
.ok()
4948
})

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

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(io_error_more)]
66
#![feature(round_char_boundary)]
77
#![feature(arbitrary_self_types)]
8-
#![feature(lint_reasons)]
98
#![allow(clippy::mutable_key_type)]
109

1110
pub mod attach;

turbopack/crates/turbo-tasks-memory/src/aggregation/increase.rs

+1
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ pub fn increase_aggregation_number_internal<C: AggregationContext>(
331331
prepared.apply(ctx, balance_queue);
332332
}
333333

334+
#[allow(dead_code)]
334335
/// A prepared `increase_aggregation_number` operation.
335336
pub struct PreparedIncreaseAggregationNumber<C: AggregationContext>(
336337
PreparedInternalIncreaseAggregationNumber<C>,

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![feature(hash_extract_if)]
22
#![feature(option_get_or_insert_default)]
33
#![feature(type_alias_impl_trait)]
4-
#![feature(lint_reasons)]
54
#![feature(box_patterns)]
65
#![feature(int_roundings)]
76
#![feature(impl_trait_in_assoc_type)]

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,8 @@ impl MemoryBackend {
270270
.get(key)
271271
// Avoid holding the lock for too long
272272
.map(|task_ref| *task_ref)
273-
.map(|task_id| {
273+
.inspect(|&task_id| {
274274
self.connect_task_child(parent_task, task_id, turbo_tasks);
275-
276-
task_id
277275
})
278276
}
279277

turbopack/crates/turbo-tasks-memory/tests/debug.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ async fn transparent_debug() {
2929
async fn enum_none_debug() {
3030
run(&REGISTRATION, async {
3131
let a: Vc<Enum> = Enum::None.cell();
32-
assert_eq!(format!("{:?}", a.dbg().await.unwrap()), "Enum::None");
32+
assert_eq!(format!("{:?}", a.dbg().await.unwrap()), "Enum :: None");
3333
})
3434
.await
3535
}
@@ -40,7 +40,7 @@ async fn enum_transparent_debug() {
4040
let a: Vc<Enum> = Enum::Transparent(Transparent(42).cell()).cell();
4141
assert_eq!(
4242
format!("{:?}", a.dbg().await.unwrap()),
43-
r#"Enum::Transparent(
43+
r#"Enum :: Transparent(
4444
42,
4545
)"#
4646
);
@@ -54,8 +54,8 @@ async fn enum_inner_vc_debug() {
5454
let a: Vc<Enum> = Enum::Enum(Enum::None.cell()).cell();
5555
assert_eq!(
5656
format!("{:?}", a.dbg().await.unwrap()),
57-
r#"Enum::Enum(
58-
Enum::None,
57+
r#"Enum :: Enum(
58+
Enum :: None,
5959
)"#
6060
);
6161
})

turbopack/crates/turbo-tasks-signposter/src/log.rs

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ unsafe impl Send for Log {}
4949
impl Default for Log {
5050
fn default() -> Self {
5151
Log {
52+
#[allow(unused_unsafe)] // This is a false positive lint.
5253
os_log: unsafe { addr_of!(_os_log_default) as *const _ as *mut _ },
5354
}
5455
}

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

-6
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,6 @@ mod ser {
219219

220220
impl<'de> Deserialize<'de> for PersistentTaskType {
221221
fn deserialize<D: ser::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
222-
#[derive(Deserialize)]
223-
enum VariantKind {
224-
Native,
225-
ResolveNative,
226-
ResolveTrait,
227-
}
228222
struct Visitor;
229223
impl<'de> serde::de::Visitor<'de> for Visitor {
230224
type Value = PersistentTaskType;

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![feature(lint_reasons)]
21
#![feature(iter_intersperse)]
32
#![feature(int_roundings)]
43
#![feature(arbitrary_self_types)]

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

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(option_get_or_insert_default)]
44
#![feature(type_alias_impl_trait)]
55
#![feature(assert_matches)]
6-
#![feature(lint_reasons)]
76
#![feature(arbitrary_self_types)]
87
#![feature(iter_intersperse)]
98

turbopack/crates/turbopack-core/src/utils.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ use std::{collections::HashSet, future::Future, hash::Hash, pin::Pin, task::Poll
33
pub fn _race_pop<'a, T: 'a, F: Future<Output = T> + Unpin>(
44
futures: &'a mut Vec<F>,
55
) -> impl Future<Output = Option<T>> + 'a {
6-
FutureRacePop { futures }
6+
_FutureRacePop { futures }
77
}
88

9-
struct FutureRacePop<'a, T, F: Future<Output = T> + Unpin> {
9+
struct _FutureRacePop<'a, T, F: Future<Output = T> + Unpin> {
1010
futures: &'a mut Vec<F>,
1111
}
1212

13-
impl<'a, T, F: Future<Output = T> + Unpin> Future for FutureRacePop<'a, T, F> {
13+
impl<'a, T, F: Future<Output = T> + Unpin> Future for _FutureRacePop<'a, T, F> {
1414
type Output = Option<T>;
1515

1616
fn poll(mut self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll<Self::Output> {

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![feature(async_closure)]
22
#![feature(min_specialization)]
3-
#![feature(lint_reasons)]
43
#![feature(arbitrary_self_types)]
54
#![feature(extract_if)]
65

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![feature(lint_reasons)]
21
#![feature(iter_intersperse)]
32
#![feature(arbitrary_self_types)]
43

0 commit comments

Comments
 (0)