Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
19006f01
Unverified
Commit
19006f01
authored
May 26, 2026
by
Tobias Koppers
Committed by
GitHub
May 26, 2026
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Upgrade rustc to nightly-2026-05-15 (#94021)"
This reverts commit
55b2d3c7
.
parent
01c9cbfe
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
72 additions
and
48 deletions
+72
-48
devcontainer-feature.json
.devcontainer/rust/devcontainer-feature.json
+1
-1
app.rs
crates/next-api/src/app.rs
+2
-2
font_fallback.rs
crates/next-core/src/next_font/google/font_fallback.rs
+1
-1
mod.rs
crates/next-core/src/next_font/google/mod.rs
+2
-2
font_fallback.rs
crates/next-core/src/next_font/local/font_fallback.rs
+2
-2
mod.rs
crates/next-core/src/next_font/local/mod.rs
+1
-1
react_server_components.rs
...stom-transforms/src/transforms/react_server_components.rs
+8
-2
turbopack_ctx.rs
crates/next-napi-bindings/src/next_api/turbopack_ctx.rs
+5
-5
rust-toolchain.toml
rust-toolchain.toml
+1
-1
backend.rs
turbopack/crates/turbo-tasks/src/backend.rs
+1
-1
update.rs
.../crates/turbopack-browser/src/ecmascript/merged/update.rs
+1
-1
mod.rs
turbopack/crates/turbopack-css/src/chunk/mod.rs
+1
-1
static_assets.rs
...k/crates/turbopack-dev-server/src/source/static_assets.rs
+1
-1
browser_runtime.rs
...rates/turbopack-ecmascript-runtime/src/browser_runtime.rs
+1
-1
graph.rs
turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
+4
-1
mod.rs
turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs
+32
-18
item.rs
turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
+1
-1
mod.rs
turbopack/crates/turbopack-ecmascript/src/references/mod.rs
+1
-0
update.rs
...ack/crates/turbopack-nodejs/src/ecmascript/node/update.rs
+1
-1
node_native_binding.rs
...opack/crates/turbopack-resolve/src/node_native_binding.rs
+1
-1
execution.rs
turbopack/crates/turbopack-tests/tests/execution.rs
+1
-1
node-file-trace.rs
turbopack/crates/turbopack-tracing/tests/node-file-trace.rs
+1
-1
publish.rs
turbopack/xtask/src/publish.rs
+2
-2
No files found.
.devcontainer/rust/devcontainer-feature.json
View file @
19006f01
...
...
@@ -5,7 +5,7 @@
"dependsOn"
:
{
"ghcr.io/devcontainers/features/rust:1"
:
{
//
this
should
match
the
`rust-toolchain.toml`
"version"
:
"nightly-2026-0
5-15
"
,
"version"
:
"nightly-2026-0
4-02
"
,
"profile"
:
"minimal"
,
"components"
:
"rustfmt,clippy,rust-analyzer"
}
...
...
crates/next-api/src/app.rs
View file @
19006f01
...
...
@@ -1587,7 +1587,7 @@ impl AppEndpoint {
client_relative_path
.clone
(),
node_root
.join
(
&
format!
(
"server/app{}/react-loadable-manifest"
,
app_entry
.original_name
&
app_entry
.original_name
))
?
,
NextRuntime
::
Edge
,
)
...
...
@@ -1711,7 +1711,7 @@ impl AppEndpoint {
client_relative_path
.clone
(),
node_root
.join
(
&
format!
(
"server/app{}/react-loadable-manifest"
,
app_entry
.original_name
&
app_entry
.original_name
))
?
,
NextRuntime
::
NodeJs
,
)
...
...
crates/next-core/src/next_font/google/font_fallback.rs
View file @
19006f01
...
...
@@ -90,7 +90,7 @@ pub(super) async fn get_font_fallback(
title
:
StyledString
::
Text
(
format!
(
"Failed to find font override values for font `{}`"
,
options
.font_family
,
&
options
.font_family
,
)
.into
(),
)
...
...
crates/next-core/src/next_font/google/mod.rs
View file @
19006f01
...
...
@@ -441,7 +441,7 @@ impl ImportMappingReplacement for NextFontGoogleFontFileReplacer {
}
=
font_file_options_from_query_map
(
query
)
?
;
let
(
filename
,
ext
)
=
split_extension
(
&
url
);
let
ext
=
ext
.with_context
(||
format!
(
"font url {} is missing an extension"
,
url
))
?
;
let
ext
=
ext
.with_context
(||
format!
(
"font url {} is missing an extension"
,
&
url
))
?
;
// remove dashes and dots as they might be used for the markers below.
let
mut
name
=
format!
(
"{:016x}"
,
hash_xxh3_hash64
(
filename
.as_bytes
()));
...
...
@@ -506,7 +506,7 @@ async fn update_google_stylesheet(
// Update font-family definitions to the scoped name
// TODO: Do this more resiliently, e.g. transforming an swc ast
let
mut
stylesheet
=
stylesheet
.await
?
.replace
(
&
format!
(
"font-family: '{}';"
,
options
.font_family
),
&
format!
(
"font-family: '{}';"
,
&
options
.font_family
),
&
format!
(
"font-family: '{scoped_font_family}';"
),
);
...
...
crates/next-core/src/next_font/local/font_fallback.rs
View file @
19006f01
...
...
@@ -111,7 +111,7 @@ async fn get_font_adjustment(
let
mut
font
=
Font
::
new
(
scope
.read
::
<
FontData
>
()
?
.table_provider
(
0
)
?
)
?
.with_context
(||
{
format!
(
"Unable to read font metrics from font file at {}"
,
main_descriptor
.path
,
&
main_descriptor
.path
,
)
})
?
;
...
...
@@ -121,7 +121,7 @@ async fn get_font_adjustment(
.with_context
(||
{
format!
(
"Unable to read font scale from font file at {}"
,
main_descriptor
.path
&
main_descriptor
.path
)
})
?
.units_per_em
as
f64
;
...
...
crates/next-core/src/next_font/local/mod.rs
View file @
19006f01
...
...
@@ -222,7 +222,7 @@ impl BeforeResolvePlugin for NextFontLocalResolvePlugin {
}
=
font_file_options_from_query_map
(
query
)
?
;
let
(
filename
,
ext
)
=
split_extension
(
&
path
);
let
ext
=
ext
.with_context
(||
format!
(
"font {} needs an extension"
,
path
))
?
;
let
ext
=
ext
.with_context
(||
format!
(
"font {} needs an extension"
,
&
path
))
?
;
// remove dashes and dots as they might be used for the markers below.
let
mut
name
=
filename
.replace
([
'-'
,
'.'
],
"_"
);
...
...
crates/next-custom-transforms/src/transforms/react_server_components.rs
View file @
19006f01
...
...
@@ -565,11 +565,17 @@ fn collect_module_info(
}
finished_directives
=
true
;
}
ModuleItem
::
ModuleDecl
(
ModuleDecl
::
ExportDefaultDecl
(
ExportDefaultDecl
{
..
}))
=>
{
ModuleItem
::
ModuleDecl
(
ModuleDecl
::
ExportDefaultDecl
(
ExportDefaultDecl
{
decl
:
_
,
..
}))
=>
{
export_names
.push
(
atom!
(
"default"
));
finished_directives
=
true
;
}
ModuleItem
::
ModuleDecl
(
ModuleDecl
::
ExportDefaultExpr
(
ExportDefaultExpr
{
..
}))
=>
{
ModuleItem
::
ModuleDecl
(
ModuleDecl
::
ExportDefaultExpr
(
ExportDefaultExpr
{
expr
:
_
,
..
}))
=>
{
export_names
.push
(
atom!
(
"default"
));
finished_directives
=
true
;
}
...
...
crates/next-napi-bindings/src/next_api/turbopack_ctx.rs
View file @
19006f01
...
...
@@ -395,7 +395,7 @@ pub fn log_internal_error_and_inform(internal_error: &anyhow::Error) {
.unwrap_or_else
(|
_
|
panic!
(
"Failed to open {}"
,
PANIC_LOG
.to_string_lossy
()));
let
internal_error_str
:
String
=
PrettyPrintError
(
internal_error
)
.to_string
();
writeln!
(
log_file
,
"{}
\n
{}"
,
LOG_DIVIDER
,
internal_error_str
)
.unwrap
();
writeln!
(
log_file
,
"{}
\n
{}"
,
LOG_DIVIDER
,
&
internal_error_str
)
.unwrap
();
let
title
=
format!
(
"Turbopack Error: {}"
,
...
...
@@ -408,10 +408,10 @@ pub fn log_internal_error_and_inform(internal_error: &anyhow::Error) {
);
let
bug_report_url
=
format!
(
"https://bugs.nextjs.org/search?category=turbopack-error-report&title={}&body={}&labels=Turbopack,Turbopack
%
20Panic
%
20Backtrace"
,
urlencoding
::
encode
(
&
title
),
urlencoding
::
encode
(
&
format!
(
&
urlencoding
::
encode
(
&
title
),
&
urlencoding
::
encode
(
&
format!
(
"{}
\n\n
Error message:
\n
```
\n
{}
\n
```"
,
version_str
,
internal_error_str
&
version_str
,
&
internal_error_str
))
);
let
bug_report_message
=
if
supports_hyperlinks
::
supports_hyperlinks
()
{
...
...
@@ -425,6 +425,6 @@ pub fn log_internal_error_and_inform(internal_error: &anyhow::Error) {
{}.
\n\n
To help make Turbopack better, report this error by {}
\n
-----
\n
"
,
"FATAL"
.red
()
.bold
(),
PANIC_LOG
.to_string_lossy
(),
bug_report_message
&
bug_report_message
);
}
rust-toolchain.toml
View file @
19006f01
# if you update this, also update `.devcontainer/rust/devcontainer-feature.json`
# if you move the file, also update any turbo.json inputs that references it.
[toolchain]
channel
=
"nightly-2026-0
5-15
"
channel
=
"nightly-2026-0
4-02
"
components
=
[
"rustfmt"
,
"clippy"
,
"rust-analyzer"
]
profile
=
"minimal"
turbopack/crates/turbo-tasks/src/backend.rs
View file @
19006f01
...
...
@@ -547,7 +547,7 @@ impl Error for TurboTasksExecutionError {
impl
Display
for
TurboTasksExecutionError
{
fn
fmt
(
&
self
,
f
:
&
mut
fmt
::
Formatter
<
'_
>
)
->
fmt
::
Result
{
match
self
{
TurboTasksExecutionError
::
Panic
(
panic
)
=>
write!
(
f
,
"{}"
,
panic
),
TurboTasksExecutionError
::
Panic
(
panic
)
=>
write!
(
f
,
"{}"
,
&
panic
),
TurboTasksExecutionError
::
Error
(
error
)
=>
{
write!
(
f
,
"{}"
,
error
.message
)
}
...
...
turbopack/crates/turbopack-browser/src/ecmascript/merged/update.rs
View file @
19006f01
...
...
@@ -96,7 +96,7 @@ impl EcmascriptModuleEntry {
Ok
(
EcmascriptModuleEntry
{
// Cloning a rope is cheap.
code
:
code
.await
?
.source_code
()
.clone
(),
url
:
format!
(
"{}?{}"
,
chunk_path
,
id
),
url
:
format!
(
"{}?{}"
,
chunk_path
,
&
id
),
map
,
})
}
...
...
turbopack/crates/turbopack-css/src/chunk/mod.rs
View file @
19006f01
...
...
@@ -130,7 +130,7 @@ impl CssChunk {
}
for
external_import
in
external_imports
{
writeln!
(
code
,
"{}"
,
external_import
)
?
;
writeln!
(
code
,
"{}"
,
&
external_import
)
?
;
}
let
built
=
&
body
.build
();
...
...
turbopack/crates/turbopack-dev-server/src/source/static_assets.rs
View file @
19006f01
...
...
@@ -132,7 +132,7 @@ impl Introspectable for StaticAssetsContentSource {
}
DirectoryEntry
::
Directory
(
path
)
=>
ResolvedVc
::
upcast
(
StaticAssetsContentSource
::
with_prefix
(
Vc
::
cell
(
format!
(
"{}{name}/"
,
prefix
)
.into
()),
Vc
::
cell
(
format!
(
"{}{name}/"
,
&*
prefix
)
.into
()),
path
.clone
(),
)
.to_resolved
()
...
...
turbopack/crates/turbopack-ecmascript-runtime/src/browser_runtime.rs
View file @
19006f01
...
...
@@ -98,7 +98,7 @@ pub async fn get_browser_runtime_code(
let
asset_suffix
=
asset_suffix
.await
?
;
let
chunk_loading_global
=
chunk_loading_global
.await
?
;
let
cross_origin
=
*
cross_origin
.await
?
;
let
chunk_lists_global
=
format!
(
"{}_CHUNK_LISTS"
,
chunk_loading_global
);
let
chunk_lists_global
=
format!
(
"{}_CHUNK_LISTS"
,
&*
chunk_loading_global
);
if
*
environment
.runtime_versions
()
...
...
turbopack/crates/turbopack-ecmascript/src/analyzer/graph.rs
View file @
19006f01
...
...
@@ -1406,7 +1406,10 @@ fn extract_names_from_object_pat(pat: &Pat) -> Option<SmallVec<[RcStr; 1]>> {
match
prop
{
ObjectPatProp
::
KeyValue
(
kv
)
=>
match
&
kv
.key
{
PropName
::
Ident
(
ident
)
=>
names
.push
(
ident
.sym
.as_str
()
.into
()),
PropName
::
Str
(
s
)
=>
names
.push
(
s
.value
.as_str
()
?
.into
()),
PropName
::
Str
(
s
)
=>
match
s
.value
.as_str
()
{
Some
(
str_val
)
=>
names
.push
(
str_val
.into
()),
None
=>
return
None
,
// non-UTF-8 string key
},
_
=>
return
None
,
// computed key, can't determine statically
},
ObjectPatProp
::
Assign
(
assign
)
=>
{
...
...
turbopack/crates/turbopack-ecmascript/src/analyzer/mod.rs
View file @
19006f01
...
...
@@ -2315,31 +2315,45 @@ impl JsValue {
break
;
}
JsValue
::
Member
(
_
,
obj
,
prop
)
=>
{
segments
.push
(
DefinableNameSegmentRef
::
Name
(
prop
.as_str
()
?
));
if
let
Some
(
prop
)
=
prop
.as_str
()
{
segments
.push
(
DefinableNameSegmentRef
::
Name
(
prop
));
}
else
{
return
None
;
}
current
=
obj
;
}
JsValue
::
WellKnownObject
(
obj
)
=>
{
segments
.extend
(
obj
.as_define_name
()
?
.iter
()
.rev
()
.copied
()
.map
(
DefinableNameSegmentRef
::
Name
),
);
break
;
if
let
Some
(
name
)
=
obj
.as_define_name
()
{
segments
.extend
(
name
.iter
()
.rev
()
.copied
()
.map
(
DefinableNameSegmentRef
::
Name
),
);
break
;
}
else
{
return
None
;
}
}
JsValue
::
WellKnownFunction
(
func
)
=>
{
segments
.extend
(
func
.as_define_name
()
?
.iter
()
.rev
()
.copied
()
.map
(
DefinableNameSegmentRef
::
Name
),
);
break
;
if
let
Some
(
name
)
=
func
.as_define_name
()
{
segments
.extend
(
name
.iter
()
.rev
()
.copied
()
.map
(
DefinableNameSegmentRef
::
Name
),
);
break
;
}
else
{
return
None
;
}
}
JsValue
::
MemberCall
(
_
,
call
)
if
call
.args
()
.is_empty
()
=>
{
segments
.push
(
DefinableNameSegmentRef
::
Call
(
call
.prop
()
.as_str
()
?
));
if
let
Some
(
prop
)
=
call
.prop
()
.as_str
()
{
segments
.push
(
DefinableNameSegmentRef
::
Call
(
prop
));
}
else
{
return
None
;
}
current
=
call
.obj
();
}
JsValue
::
TypeOf
(
_
,
arg
)
=>
{
...
...
turbopack/crates/turbopack-ecmascript/src/chunk/item.rs
View file @
19006f01
...
...
@@ -328,7 +328,7 @@ async fn module_factory_with_code_generation_issue(
.emit
();
let
mut
code
=
CodeBuilder
::
default
();
code
+=
"(() => {{
\n\n
"
;
writeln!
(
code
,
"throw new Error({error});"
,
error
=
js_error_message
)
?
;
writeln!
(
code
,
"throw new Error({error});"
,
error
=
&
js_error_message
)
?
;
code
+=
"
\n
}})"
;
*
code
.build
()
.cell_persisted
()
}
...
...
turbopack/crates/turbopack-ecmascript/src/references/mod.rs
View file @
19006f01
...
...
@@ -1490,6 +1490,7 @@ async fn handle_call<G: Fn(Vec<Effect>) + Send + Sync>(
url_rewrite_behavior
,
collect_affecting_sources
,
tracing_only
,
allow_project_root_tracing
:
_
,
..
}
=
state
;
...
...
turbopack/crates/turbopack-nodejs/src/ecmascript/node/update.rs
View file @
19006f01
...
...
@@ -73,7 +73,7 @@ impl EcmascriptModuleEntry {
Ok
(
EcmascriptModuleEntry
{
// Cloning a rope is cheap.
code
:
code
.await
?
.source_code
()
.clone
(),
url
:
format!
(
"{}?{}"
,
chunk_path
,
id
),
url
:
format!
(
"{}?{}"
,
chunk_path
,
&
id
),
map
,
})
}
...
...
turbopack/crates/turbopack-resolve/src/node_native_binding.rs
View file @
19006f01
...
...
@@ -435,7 +435,7 @@ async fn resolve_node_bindings_files(
let
modules
=
BINDINGS_TRY
.iter
()
.map
(|
try_dir
|
try_path
.clone
()(
format!
(
"{}/{}"
,
try_dir
,
file_name
)
.into
()))
.map
(|
try_dir
|
try_path
.clone
()(
format!
(
"{}/{}"
,
try_dir
,
&
file_name
)
.into
()))
.try_flat_join
()
.await
?
;
Ok
(
*
ModuleResolveResult
::
modules
(
modules
))
...
...
turbopack/crates/turbopack-tests/tests/execution.rs
View file @
19006f01
...
...
@@ -326,7 +326,7 @@ async fn prepare_test(resource: RcStr) -> Result<Vc<PreparedTest>> {
let
relative_path
=
resource_path
.strip_prefix
(
&*
REPO_ROOT
)
.with_context
(||
{
format!
(
"stripping repo root {:?} from resource path {:?}"
,
REPO_ROOT
,
&*
REPO_ROOT
,
resource_path
.display
()
)
})
?
;
...
...
turbopack/crates/turbopack-tracing/tests/node-file-trace.rs
View file @
19006f01
...
...
@@ -614,7 +614,7 @@ impl Display for CommandOutput {
write!
(
f
,
"---------- Stdout ----------
\n
{}
\n
---------- Stderr ----------
\n
{}"
,
self
.stdout
,
self
.stderr
,
&
self
.stdout
,
&
self
.stderr
,
)
}
}
...
...
turbopack/xtask/src/publish.rs
View file @
19006f01
...
...
@@ -132,7 +132,7 @@ pub fn run_publish(name: &str) {
let
dir_name
=
format!
(
"{}-{}-{}"
,
pkg
.crate_name
,
platform
.os
,
platform
.arch
);
let
target_dir
=
package_dir
.join
(
"npm"
)
.join
(
dir_name
);
fs
::
create_dir
(
&
target_dir
)
.unwrap_or_else
(|
e
|
panic!
(
"Unable to create dir: {:?}
\n
{e}"
,
target_dir
));
.unwrap_or_else
(|
e
|
panic!
(
"Unable to create dir: {:?}
\n
{e}"
,
&
target_dir
));
fs
::
write
(
target_dir
.join
(
"../../package.json"
),
serde_json
::
to_string_pretty
(
&
pkg_json
)
.unwrap
(),
...
...
@@ -263,7 +263,7 @@ pub fn run_bump(names: FxHashSet<String>, dry_run: bool) {
}
let
mut
tags_to_apply
=
Vec
::
new
();
workspaces_to_bump
.iter
()
.for_each
(|
p
|
{
let
title
=
format!
(
"Version for {}"
,
p
.name
);
let
title
=
format!
(
"Version for {}"
,
&
p
.name
);
let
selector
=
inquire
::
Select
::
new
(
title
.as_str
(),
VERSION_TYPE
.to_owned
());
let
version_type
=
selector
.prompt
()
.expect
(
"Get version type failed"
);
let
mut
semver_version
=
Version
::
parse
(
&
p
.version
)
.unwrap_or_else
(|
e
|
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment