Skip to content

fix(rustdoc): Fix rustdoc warnings, block on rustdoc failures in CI #76448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2025
Merged

fix(rustdoc): Fix rustdoc warnings, block on rustdoc failures in CI #76448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ jobs:
stepName: 'rust-check'
secrets: inherit

rust-doc-check:
rustdoc-check:
name: rustdoc check
needs: ['changes', 'build-next']
if: ${{ needs.changes.outputs.docs-only == 'false' }}
Expand All @@ -175,7 +175,7 @@ jobs:
skipInstallBuild: 'yes'
skipNativeBuild: 'yes'
afterBuild: ./scripts/deploy-turbopack-docs.sh
stepName: 'rust-doc-check'
stepName: 'rustdoc-check'
secrets: inherit

ast-grep:
Expand Down Expand Up @@ -635,6 +635,7 @@ jobs:
'test-ppr-integration',
'test-cargo-unit',
'rust-check',
'rustdoc-check',
'test-next-swc-wasm',
'test-turbopack-dev',
'test-turbopack-integration',
Expand Down
2 changes: 1 addition & 1 deletion crates/napi/src/next_api/project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ pub fn project_hmr_identifiers_subscribe(
)
}

enum UpdateMessage {
pub enum UpdateMessage {
Start,
End(UpdateInfo),
}
Expand Down
4 changes: 2 additions & 2 deletions crates/next-api/src/project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,8 +495,8 @@ impl ProjectContainer {
self.project().hmr_identifiers()
}

/// Gets a source map for a particular `file_path`. If `dev` mode is
/// disabled, this will always return [`OptionSourceMap::none`].
/// Gets a source map for a particular `file_path`. If `dev` mode is disabled, this will always
/// return [`OptionStringifiedSourceMap::none`].
#[turbo_tasks::function]
pub fn get_source_map(
&self,
Expand Down
13 changes: 6 additions & 7 deletions crates/next-core/src/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,12 @@ pub async fn foreign_code_context_condition(
Ok(result)
}

/// Determines if the module is an internal asset (i.e overlay, fallback) coming
/// from the embedded FS, don't apply user defined transforms.
///
/// [TODO] turbopack specific embed fs should be handled by internals of
/// turbopack itself and user config should not try to leak this. However,
/// currently we apply few transform options subject to next.js's configuration
/// even if it's embedded assets.
/// Determines if the module is an internal asset (i.e overlay, fallback) coming from the embedded
/// FS, don't apply user defined transforms.
//
// TODO: Turbopack specific embed fs paths should be handled by internals of Turbopack itself and
// user config should not try to leak this. However, currently we apply few transform options
// subject to Next.js's configuration even if it's embedded assets.
pub async fn internal_assets_conditions() -> Result<ContextCondition> {
Ok(ContextCondition::any(vec![
ContextCondition::InPath(next_js_fs().root().to_resolved().await?),
Expand Down
Loading