Unverified Commit b6a4b0d0 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Remove `endpoint.write_to_disk()` in favor of standardized `endpoint.output()` (#75059)

This:
- Makes the Endpoint trait not manage any file writing on its own,
instead returning a structure containing OutputAssets, the paths where
the OutputAssets can be found, and the associated Project.
- Allows for OutputAssets to be written at a future point in Turbopack
- Implements `endpoint_write_to_disk` for compatibility in dev. This
continues to be used for prod builds, but in the future it won’t.

In a future PR, production builds will dedupe and unify all output
assets, writing them to disk at once, rather than exposing individual
endpoint writes to JS to occur sequentially.

Test Plan: CI
parent 7be48db8
...@@ -6,7 +6,7 @@ use next_api::{ ...@@ -6,7 +6,7 @@ use next_api::{
paths::ServerPath, paths::ServerPath,
route::{ route::{
endpoint_server_changed_operation, endpoint_write_to_disk_operation, Endpoint, endpoint_server_changed_operation, endpoint_write_to_disk_operation, Endpoint,
WrittenEndpoint, EndpointOutputPaths,
}, },
}; };
use tracing::Instrument; use tracing::Instrument;
...@@ -52,10 +52,10 @@ pub struct NapiWrittenEndpoint { ...@@ -52,10 +52,10 @@ pub struct NapiWrittenEndpoint {
pub config: NapiEndpointConfig, pub config: NapiEndpointConfig,
} }
impl From<Option<WrittenEndpoint>> for NapiWrittenEndpoint { impl From<Option<EndpointOutputPaths>> for NapiWrittenEndpoint {
fn from(written_endpoint: Option<WrittenEndpoint>) -> Self { fn from(written_endpoint: Option<EndpointOutputPaths>) -> Self {
match written_endpoint { match written_endpoint {
Some(WrittenEndpoint::NodeJs { Some(EndpointOutputPaths::NodeJs {
server_entry_path, server_entry_path,
server_paths, server_paths,
client_paths, client_paths,
...@@ -66,7 +66,7 @@ impl From<Option<WrittenEndpoint>> for NapiWrittenEndpoint { ...@@ -66,7 +66,7 @@ impl From<Option<WrittenEndpoint>> for NapiWrittenEndpoint {
server_paths: server_paths.into_iter().map(From::from).collect(), server_paths: server_paths.into_iter().map(From::from).collect(),
..Default::default() ..Default::default()
}, },
Some(WrittenEndpoint::Edge { Some(EndpointOutputPaths::Edge {
server_paths, server_paths,
client_paths, client_paths,
}) => Self { }) => Self {
...@@ -125,7 +125,7 @@ async fn strongly_consistent_catch_collectables<R: VcValueType + Send>( ...@@ -125,7 +125,7 @@ async fn strongly_consistent_catch_collectables<R: VcValueType + Send>(
#[turbo_tasks::value(serialization = "none")] #[turbo_tasks::value(serialization = "none")]
struct WrittenEndpointWithIssues { struct WrittenEndpointWithIssues {
written: Option<ReadRef<WrittenEndpoint>>, written: Option<ReadRef<EndpointOutputPaths>>,
issues: Arc<Vec<ReadRef<PlainIssue>>>, issues: Arc<Vec<ReadRef<PlainIssue>>>,
diagnostics: Arc<Vec<ReadRef<PlainDiagnostic>>>, diagnostics: Arc<Vec<ReadRef<PlainDiagnostic>>>,
effects: Arc<Effects>, effects: Arc<Effects>,
......
...@@ -82,7 +82,7 @@ use crate::{ ...@@ -82,7 +82,7 @@ use crate::{
get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings, get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings,
}, },
project::{ModuleGraphs, Project}, project::{ModuleGraphs, Project},
route::{AppPageRoute, Endpoint, Route, Routes, WrittenEndpoint}, route::{AppPageRoute, Endpoint, EndpointOutput, EndpointOutputPaths, Route, Routes},
server_actions::{build_server_actions_loader, create_server_actions_manifest}, server_actions::{build_server_actions_loader, create_server_actions_manifest},
webpack_stats::generate_webpack_stats, webpack_stats::generate_webpack_stats,
}; };
...@@ -1793,7 +1793,7 @@ async fn create_app_paths_manifest( ...@@ -1793,7 +1793,7 @@ async fn create_app_paths_manifest(
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Endpoint for AppEndpoint { impl Endpoint for AppEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn write_to_disk(self: ResolvedVc<Self>) -> Result<Vc<WrittenEndpoint>> { async fn output(self: ResolvedVc<Self>) -> Result<Vc<EndpointOutput>> {
let this = self.await?; let this = self.await?;
let page_name = this.page.to_string(); let page_name = this.page.to_string();
let span = match this.ty { let span = match this.ty {
...@@ -1816,20 +1816,13 @@ impl Endpoint for AppEndpoint { ...@@ -1816,20 +1816,13 @@ impl Endpoint for AppEndpoint {
tracing::info_span!("app endpoint metadata", name = page_name) tracing::info_span!("app endpoint metadata", name = page_name)
} }
}; };
async move { async move {
let output = self.output().await?; let output = self.output().await?;
let output_assets_op = output_assets_operation(self); let output_assets = self.output().output_assets();
let output_assets = output_assets_op.connect();
let node_root = this.app_project.project().node_root(); let node_root = this.app_project.project().node_root();
let node_root_ref = &node_root.await?; let node_root_ref = &node_root.await?;
let _ = this
.app_project
.project()
.emit_all_output_assets(output_assets_op);
let (server_paths, client_paths) = if this let (server_paths, client_paths) = if this
.app_project .app_project
.project() .project()
...@@ -1854,7 +1847,7 @@ impl Endpoint for AppEndpoint { ...@@ -1854,7 +1847,7 @@ impl Endpoint for AppEndpoint {
}; };
let written_endpoint = match *output { let written_endpoint = match *output {
AppEndpointOutput::NodeJs { rsc_chunk, .. } => WrittenEndpoint::NodeJs { AppEndpointOutput::NodeJs { rsc_chunk, .. } => EndpointOutputPaths::NodeJs {
server_entry_path: node_root_ref server_entry_path: node_root_ref
.get_path_to(&*rsc_chunk.ident().path().await?) .get_path_to(&*rsc_chunk.ident().path().await?)
.context("Node.js chunk entry path must be inside the node root")? .context("Node.js chunk entry path must be inside the node root")?
...@@ -1862,12 +1855,20 @@ impl Endpoint for AppEndpoint { ...@@ -1862,12 +1855,20 @@ impl Endpoint for AppEndpoint {
server_paths, server_paths,
client_paths, client_paths,
}, },
AppEndpointOutput::Edge { .. } => WrittenEndpoint::Edge { AppEndpointOutput::Edge { .. } => EndpointOutputPaths::Edge {
server_paths, server_paths,
client_paths, client_paths,
}, },
}; };
anyhow::Ok(written_endpoint.cell())
anyhow::Ok(
EndpointOutput {
output_assets: output_assets.to_resolved().await?,
output_paths: written_endpoint.resolved_cell(),
project: this.app_project.project().to_resolved().await?,
}
.cell(),
)
} }
.instrument(span) .instrument(span)
.await .await
...@@ -1937,11 +1938,6 @@ impl Endpoint for AppEndpoint { ...@@ -1937,11 +1938,6 @@ impl Endpoint for AppEndpoint {
} }
} }
#[turbo_tasks::function(operation)]
fn output_assets_operation(endpoint: ResolvedVc<AppEndpoint>) -> Vc<OutputAssets> {
endpoint.output().output_assets()
}
#[turbo_tasks::value] #[turbo_tasks::value]
enum AppEndpointOutput { enum AppEndpointOutput {
NodeJs { NodeJs {
......
...@@ -2,7 +2,7 @@ use anyhow::{bail, Result}; ...@@ -2,7 +2,7 @@ use anyhow::{bail, Result};
use turbo_tasks::{Completion, Vc}; use turbo_tasks::{Completion, Vc};
use turbopack_core::module::Modules; use turbopack_core::module::Modules;
use crate::route::{Endpoint, WrittenEndpoint}; use crate::route::{Endpoint, EndpointOutput};
#[turbo_tasks::value] #[turbo_tasks::value]
pub struct EmptyEndpoint; pub struct EmptyEndpoint;
...@@ -18,8 +18,8 @@ impl EmptyEndpoint { ...@@ -18,8 +18,8 @@ impl EmptyEndpoint {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Endpoint for EmptyEndpoint { impl Endpoint for EmptyEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
fn write_to_disk(self: Vc<Self>) -> Result<Vc<WrittenEndpoint>> { fn output(self: Vc<Self>) -> Result<Vc<EndpointOutput>> {
bail!("Empty endpoint can't be written to disk") bail!("Empty endpoint can't have output")
} }
#[turbo_tasks::function] #[turbo_tasks::function]
......
...@@ -30,7 +30,7 @@ use crate::{ ...@@ -30,7 +30,7 @@ use crate::{
all_server_paths, get_js_paths_from_root, get_wasm_paths_from_root, wasm_paths_to_bindings, all_server_paths, get_js_paths_from_root, get_wasm_paths_from_root, wasm_paths_to_bindings,
}, },
project::Project, project::Project,
route::{Endpoint, WrittenEndpoint}, route::{Endpoint, EndpointOutput, EndpointOutputPaths},
}; };
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -249,18 +249,11 @@ struct InstrumentationCoreModules { ...@@ -249,18 +249,11 @@ struct InstrumentationCoreModules {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Endpoint for InstrumentationEndpoint { impl Endpoint for InstrumentationEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn write_to_disk(self: ResolvedVc<Self>) -> Result<Vc<WrittenEndpoint>> { async fn output(self: ResolvedVc<Self>) -> Result<Vc<EndpointOutput>> {
let span = tracing::info_span!("instrumentation endpoint"); let span = tracing::info_span!("instrumentation endpoint");
async move { async move {
let this = self.await?; let this = self.await?;
let output_assets_op = output_assets_operation(self); let output_assets = self.output_assets();
let output_assets = output_assets_op.connect();
let _ = output_assets.resolve().await?;
let _ = this
.project
.emit_all_output_assets(output_assets_op)
.resolve()
.await?;
let server_paths = if this.project.next_mode().await?.is_development() { let server_paths = if this.project.next_mode().await?.is_development() {
let node_root = this.project.node_root(); let node_root = this.project.node_root();
...@@ -271,10 +264,15 @@ impl Endpoint for InstrumentationEndpoint { ...@@ -271,10 +264,15 @@ impl Endpoint for InstrumentationEndpoint {
vec![] vec![]
}; };
Ok(WrittenEndpoint::Edge { Ok(EndpointOutput {
output_assets: output_assets.to_resolved().await?,
output_paths: EndpointOutputPaths::Edge {
server_paths, server_paths,
client_paths: vec![], client_paths: vec![],
} }
.resolved_cell(),
project: this.project,
}
.cell()) .cell())
} }
.instrument(span) .instrument(span)
...@@ -300,8 +298,3 @@ impl Endpoint for InstrumentationEndpoint { ...@@ -300,8 +298,3 @@ impl Endpoint for InstrumentationEndpoint {
])) ]))
} }
} }
#[turbo_tasks::function(operation)]
fn output_assets_operation(endpoint: ResolvedVc<InstrumentationEndpoint>) -> Vc<OutputAssets> {
endpoint.output_assets()
}
...@@ -31,7 +31,7 @@ use crate::{ ...@@ -31,7 +31,7 @@ use crate::{
get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings, get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings,
}, },
project::Project, project::Project,
route::{Endpoint, WrittenEndpoint}, route::{Endpoint, EndpointOutput, EndpointOutputPaths},
}; };
#[turbo_tasks::value] #[turbo_tasks::value]
...@@ -277,18 +277,11 @@ impl MiddlewareEndpoint { ...@@ -277,18 +277,11 @@ impl MiddlewareEndpoint {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Endpoint for MiddlewareEndpoint { impl Endpoint for MiddlewareEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn write_to_disk(self: ResolvedVc<Self>) -> Result<Vc<WrittenEndpoint>> { async fn output(self: ResolvedVc<Self>) -> Result<Vc<EndpointOutput>> {
let span = tracing::info_span!("middleware endpoint"); let span = tracing::info_span!("middleware endpoint");
async move { async move {
let this = self.await?; let this = self.await?;
let output_assets_op = output_assets_operation(self); let output_assets = self.output_assets();
let output_assets = output_assets_op.connect();
let _ = output_assets.resolve().await?;
let _ = this
.project
.emit_all_output_assets(output_assets_op)
.resolve()
.await?;
let (server_paths, client_paths) = if this.project.next_mode().await?.is_development() { let (server_paths, client_paths) = if this.project.next_mode().await?.is_development() {
let node_root = this.project.node_root(); let node_root = this.project.node_root();
...@@ -308,10 +301,15 @@ impl Endpoint for MiddlewareEndpoint { ...@@ -308,10 +301,15 @@ impl Endpoint for MiddlewareEndpoint {
(vec![], vec![]) (vec![], vec![])
}; };
Ok(WrittenEndpoint::Edge { Ok(EndpointOutput {
output_paths: EndpointOutputPaths::Edge {
server_paths, server_paths,
client_paths, client_paths,
} }
.resolved_cell(),
output_assets: output_assets.to_resolved().await?,
project: this.project,
}
.cell()) .cell())
} }
.instrument(span) .instrument(span)
...@@ -333,8 +331,3 @@ impl Endpoint for MiddlewareEndpoint { ...@@ -333,8 +331,3 @@ impl Endpoint for MiddlewareEndpoint {
Ok(Vc::cell(vec![self.entry_module().to_resolved().await?])) Ok(Vc::cell(vec![self.entry_module().to_resolved().await?]))
} }
} }
#[turbo_tasks::function(operation)]
fn output_assets_operation(endpoint: ResolvedVc<MiddlewareEndpoint>) -> Vc<OutputAssets> {
endpoint.output_assets()
}
...@@ -77,7 +77,7 @@ use crate::{ ...@@ -77,7 +77,7 @@ use crate::{
get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings, get_wasm_paths_from_root, paths_to_bindings, wasm_paths_to_bindings,
}, },
project::Project, project::Project,
route::{Endpoint, Route, Routes, WrittenEndpoint}, route::{Endpoint, EndpointOutput, EndpointOutputPaths, Route, Routes},
webpack_stats::generate_webpack_stats, webpack_stats::generate_webpack_stats,
}; };
...@@ -1369,7 +1369,7 @@ pub struct InternalSsrChunkModule { ...@@ -1369,7 +1369,7 @@ pub struct InternalSsrChunkModule {
#[turbo_tasks::value_impl] #[turbo_tasks::value_impl]
impl Endpoint for PageEndpoint { impl Endpoint for PageEndpoint {
#[turbo_tasks::function] #[turbo_tasks::function]
async fn write_to_disk(self: ResolvedVc<Self>) -> Result<Vc<WrittenEndpoint>> { async fn output(self: ResolvedVc<Self>) -> Result<Vc<EndpointOutput>> {
let this = self.await?; let this = self.await?;
let original_name = this.original_name.await?; let original_name = this.original_name.await?;
let span = { let span = {
...@@ -1390,15 +1390,7 @@ impl Endpoint for PageEndpoint { ...@@ -1390,15 +1390,7 @@ impl Endpoint for PageEndpoint {
}; };
async move { async move {
let output = self.output().await?; let output = self.output().await?;
let output_assets_op = output_assets_operation(self); let output_assets = self.output().output_assets();
let output_assets = output_assets_op.connect();
let _ = this
.pages_project
.project()
.emit_all_output_assets(output_assets_op)
.resolve()
.await?;
let node_root = this.pages_project.project().node_root(); let node_root = this.pages_project.project().node_root();
...@@ -1426,7 +1418,7 @@ impl Endpoint for PageEndpoint { ...@@ -1426,7 +1418,7 @@ impl Endpoint for PageEndpoint {
let node_root = &node_root.await?; let node_root = &node_root.await?;
let written_endpoint = match *output { let written_endpoint = match *output {
PageEndpointOutput::NodeJs { entry_chunk, .. } => WrittenEndpoint::NodeJs { PageEndpointOutput::NodeJs { entry_chunk, .. } => EndpointOutputPaths::NodeJs {
server_entry_path: node_root server_entry_path: node_root
.get_path_to(&*entry_chunk.ident().path().await?) .get_path_to(&*entry_chunk.ident().path().await?)
.context("ssr chunk entry path must be inside the node root")? .context("ssr chunk entry path must be inside the node root")?
...@@ -1434,13 +1426,20 @@ impl Endpoint for PageEndpoint { ...@@ -1434,13 +1426,20 @@ impl Endpoint for PageEndpoint {
server_paths, server_paths,
client_paths, client_paths,
}, },
PageEndpointOutput::Edge { .. } => WrittenEndpoint::Edge { PageEndpointOutput::Edge { .. } => EndpointOutputPaths::Edge {
server_paths, server_paths,
client_paths, client_paths,
}, },
}; };
anyhow::Ok(written_endpoint.cell()) anyhow::Ok(
EndpointOutput {
output_assets: output_assets.to_resolved().await?,
output_paths: written_endpoint.resolved_cell(),
project: this.pages_project.project().to_resolved().await?,
}
.cell(),
)
} }
.instrument(span) .instrument(span)
.await .await
...@@ -1481,11 +1480,6 @@ impl Endpoint for PageEndpoint { ...@@ -1481,11 +1480,6 @@ impl Endpoint for PageEndpoint {
} }
} }
#[turbo_tasks::function(operation)]
fn output_assets_operation(endpoint: ResolvedVc<PageEndpoint>) -> Vc<OutputAssets> {
endpoint.output().output_assets()
}
#[turbo_tasks::value] #[turbo_tasks::value]
enum PageEndpointOutput { enum PageEndpointOutput {
NodeJs { NodeJs {
......
use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, Completion, FxIndexMap, NonLocalValue, debug::ValueDebugFormat, trace::TraceRawVcs, Completion, FxIndexMap, NonLocalValue,
OperationVc, ResolvedVc, Vc, OperationVc, ResolvedVc, Vc,
}; };
use turbopack_core::{module::Modules, module_graph::ModuleGraph}; use turbopack_core::{module::Modules, module_graph::ModuleGraph, output::OutputAssets};
use crate::paths::ServerPath; use crate::{paths::ServerPath, project::Project};
#[derive( #[derive(
TraceRawVcs, TraceRawVcs,
...@@ -45,7 +46,8 @@ pub enum Route { ...@@ -45,7 +46,8 @@ pub enum Route {
#[turbo_tasks::value_trait] #[turbo_tasks::value_trait]
pub trait Endpoint { pub trait Endpoint {
fn write_to_disk(self: Vc<Self>) -> Vc<WrittenEndpoint>; fn output(self: Vc<Self>) -> Vc<EndpointOutput>;
// fn write_to_disk(self: Vc<Self>) -> Vc<EndpointOutputPaths>;
fn server_changed(self: Vc<Self>) -> Vc<Completion>; fn server_changed(self: Vc<Self>) -> Vc<Completion>;
fn client_changed(self: Vc<Self>) -> Vc<Completion>; fn client_changed(self: Vc<Self>) -> Vc<Completion>;
/// The entry modules for the modules graph. /// The entry modules for the modules graph.
...@@ -60,11 +62,42 @@ pub trait Endpoint { ...@@ -60,11 +62,42 @@ pub trait Endpoint {
#[turbo_tasks::value(transparent)] #[turbo_tasks::value(transparent)]
pub struct Endpoints(Vec<ResolvedVc<Box<dyn Endpoint>>>); pub struct Endpoints(Vec<ResolvedVc<Box<dyn Endpoint>>>);
#[turbo_tasks::function]
pub async fn endpoint_write_to_disk(
endpoint: ResolvedVc<Box<dyn Endpoint>>,
) -> Result<Vc<EndpointOutputPaths>> {
let output_op = output_assets_operation(endpoint);
let EndpointOutput {
project,
output_paths,
..
} = *output_op.connect().await?;
let _ = project
.emit_all_output_assets(endpoint_output_assets_operation(output_op))
.resolve()
.await?;
Ok(*output_paths)
}
#[turbo_tasks::function(operation)]
fn output_assets_operation(endpoint: ResolvedVc<Box<dyn Endpoint>>) -> Vc<EndpointOutput> {
endpoint.output()
}
#[turbo_tasks::function(operation)]
async fn endpoint_output_assets_operation(
output: OperationVc<EndpointOutput>,
) -> Result<Vc<OutputAssets>> {
Ok(*output.connect().await?.output_assets)
}
#[turbo_tasks::function(operation)] #[turbo_tasks::function(operation)]
pub fn endpoint_write_to_disk_operation( pub fn endpoint_write_to_disk_operation(
endpoint: OperationVc<Box<dyn Endpoint>>, endpoint: OperationVc<Box<dyn Endpoint>>,
) -> Vc<WrittenEndpoint> { ) -> Vc<EndpointOutputPaths> {
endpoint.connect().write_to_disk() endpoint_write_to_disk(endpoint.connect())
} }
#[turbo_tasks::function(operation)] #[turbo_tasks::function(operation)]
...@@ -76,7 +109,15 @@ pub fn endpoint_server_changed_operation( ...@@ -76,7 +109,15 @@ pub fn endpoint_server_changed_operation(
#[turbo_tasks::value(shared)] #[turbo_tasks::value(shared)]
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum WrittenEndpoint { pub struct EndpointOutput {
pub output_assets: ResolvedVc<OutputAssets>,
pub output_paths: ResolvedVc<EndpointOutputPaths>,
pub project: ResolvedVc<Project>,
}
#[turbo_tasks::value(shared)]
#[derive(Debug, Clone)]
pub enum EndpointOutputPaths {
NodeJs { NodeJs {
/// Relative to the root_path /// Relative to the root_path
server_entry_path: String, server_entry_path: String,
......
...@@ -9,7 +9,7 @@ use anyhow::{Context, Result}; ...@@ -9,7 +9,7 @@ use anyhow::{Context, Result};
use futures_util::{StreamExt, TryStreamExt}; use futures_util::{StreamExt, TryStreamExt};
use next_api::{ use next_api::{
project::{ProjectContainer, ProjectOptions}, project::{ProjectContainer, ProjectOptions},
route::{Endpoint, Route}, route::{endpoint_write_to_disk, Route},
}; };
use turbo_rcstr::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ReadConsistency, TransientInstance, TurboTasks, Vc}; use turbo_tasks::{ReadConsistency, TransientInstance, TurboTasks, Vc};
...@@ -185,21 +185,21 @@ pub async fn render_routes( ...@@ -185,21 +185,21 @@ pub async fn render_routes(
html_endpoint, html_endpoint,
data_endpoint: _, data_endpoint: _,
} => { } => {
html_endpoint.write_to_disk().await?; endpoint_write_to_disk(*html_endpoint).await?;
} }
Route::PageApi { endpoint } => { Route::PageApi { endpoint } => {
endpoint.write_to_disk().await?; endpoint_write_to_disk(*endpoint).await?;
} }
Route::AppPage(routes) => { Route::AppPage(routes) => {
for route in routes { for route in routes {
route.html_endpoint.write_to_disk().await?; endpoint_write_to_disk(*route.html_endpoint).await?;
} }
} }
Route::AppRoute { Route::AppRoute {
original_name: _, original_name: _,
endpoint, endpoint,
} => { } => {
endpoint.write_to_disk().await?; endpoint_write_to_disk(*endpoint).await?;
} }
Route::Conflict => { Route::Conflict => {
tracing::info!("WARN: conflict {}", name); tracing::info!("WARN: conflict {}", name);
......
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