Skip to content

Commit da9171e

Browse files
committed
internal: Ensure rustdoc GitHub action runs on PRs
We want to complain on PRs that generate rustdoc warnings, but only deploy the generate HTML on the master branch. Also fix the existing rustdoc warning. AI disclosure: Some Claude Opus usage.
1 parent 2fef13c commit da9171e

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

.github/workflows/rustdoc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
branches:
55
- master
6+
pull_request:
7+
merge_group:
68

79
env:
810
CARGO_INCREMENTAL: 0
@@ -28,6 +30,7 @@ jobs:
2830
run: cargo doc --all --no-deps --document-private-items
2931

3032
- name: Deploy Docs
33+
if: github.event_name == 'push' && github.repository == 'rust-lang/rust-analyzer' && github.ref == 'refs/heads/master'
3134
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
3235
with:
3336
github_token: ${{ secrets.GITHUB_TOKEN }}

crates/hir-expand/src/attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl AstKeyValueMetaExt for ast::KeyValueMeta {
9292
}
9393

9494
/// The callback is passed the attribute and the outermost `ast::Attr`.
95-
/// Note that one node may map to multiple [`Meta`]s due to `cfg_attr`.
95+
/// Note that one node may map to multiple [`ast::Meta`]s due to `cfg_attr`.
9696
///
9797
/// `unsafe(attr)` are passed the inner attribute for now.
9898
#[inline]

0 commit comments

Comments
 (0)