Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d47f6c6

Browse files
committedJan 22, 2022
ci: Build-test documentation with warnings disallowed, and fix links
Broken links that snuck in (most recently in #530 and #537) while the CI was not testing the documentation have also been corrected, to allow it to succeed again (and to have proper docs in the first place).
1 parent fbcc45f commit d47f6c6

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed
 

‎.github/workflows/ci.yml

+18
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,21 @@ jobs:
111111
with:
112112
command: clippy
113113
args: --workspace --all-targets -- -D warnings
114+
115+
docs:
116+
name: Build-test docs
117+
runs-on: ubuntu-latest
118+
steps:
119+
- uses: actions/checkout@v2
120+
- uses: actions-rs/toolchain@v1
121+
with:
122+
profile: minimal
123+
toolchain: stable
124+
override: true
125+
- uses: actions-rs/cargo@v1
126+
name: Document all crates
127+
env:
128+
RUSTDOCFLAGS: -Dwarnings
129+
with:
130+
command: doc
131+
args: --all --all-features --no-deps --document-private-items

‎Changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased] - ReleaseDate
88

9+
### Changed
10+
11+
- Fixed broken (intradoc) links in the prelude and `VK_KHR_get_surface_capabilities2` extension (#559)
12+
913
### Added
1014

1115
- Added conversions from `Extent2D` to `Extent3D` and `Rect2D` (#557)

‎ash/src/extensions/khr/get_surface_capabilities2.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl GetSurfaceCapabilities2 {
1717
Self { fp }
1818
}
1919

20-
#[doc = "https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html"]
20+
#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/vkGetPhysicalDeviceSurfaceCapabilities2KHR.html>"]
2121
pub unsafe fn get_physical_device_surface_capabilities2(
2222
&self,
2323
physical_device: vk::PhysicalDevice,
@@ -49,7 +49,7 @@ impl GetSurfaceCapabilities2 {
4949
err_code.result_with_success(count as usize)
5050
}
5151

52-
#[doc = "https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html"]
52+
#[doc = "<https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/vkGetPhysicalDeviceSurfaceFormats2KHR.html>"]
5353
///
5454
/// Call [`Self::get_physical_device_surface_formats2_len()`] to query the number of elements to pass to `out`.
5555
/// Be sure to [`Default::default()`]-initialize these elements and optionally set their `p_next` pointer.

‎ash/src/vk/prelude.rs

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ use crate::vk;
44
/// and 8 bytes in the most significant bits of that memory,
55
/// occupying a single [`u32`] in total. This is commonly used in
66
/// [acceleration structure instances] such as
7-
/// [`vk::AccelerationStructureInstanceKHR`][super::AccelerationStructureInstanceKHR],
8-
/// [`vk::AccelerationStructureSRTMotionInstanceNV`][super::AccelerationStructureSRTMotionInstanceNV] and
9-
/// [`vk::AccelerationStructureMatrixMotionInstanceNV`][super::AccelerationStructureMatrixMotionInstanceNV].
7+
/// [`vk::AccelerationStructureInstanceKHR`],
8+
/// [`vk::AccelerationStructureSRTMotionInstanceNV`] and
9+
/// [`vk::AccelerationStructureMatrixMotionInstanceNV`].
1010
///
1111
/// [acceleration structure instances]: https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VkAccelerationStructureInstanceKHR.html#_description
1212
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
@@ -29,7 +29,11 @@ impl Packed24_8 {
2929
}
3030
}
3131

32-
impl super::ColorComponentFlags {
32+
// Intradoc `Self::` links refuse to resolve if `ColorComponentFlags`
33+
// isn't directly in scope: https://github.com/rust-lang/rust/issues/93205
34+
use vk::ColorComponentFlags;
35+
36+
impl ColorComponentFlags {
3337
/// Contraction of [`Self::R`] | [`Self::G`] | [`Self::B`] | [`Self::A`]
3438
pub const RGBA: Self = Self(Self::R.0 | Self::G.0 | Self::B.0 | Self::A.0);
3539
}

0 commit comments

Comments
 (0)
Please sign in to comment.