diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b30e6248d..9b0533b9ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,6 +106,12 @@ jobs: rustup override set ${{ env.REPO_MSRV }} cargo -V + # Use nightly for rustdoc, see https://github.com/gfx-rs/wgpu/issues/4905 + - name: Install Nightly toolchain + run: | + rustup toolchain install nightly --no-self-update --profile=minimal --component rust-docs --target ${{ matrix.target }} + cargo +nightly -V + - name: disable debug shell: bash run: | @@ -146,11 +152,11 @@ jobs: # build for WebGPU cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv,fragile-send-sync-non-atomic-wasm cargo clippy --target ${{ matrix.target }} --tests --features glsl,spirv - cargo doc --target ${{ matrix.target }} --no-deps --features glsl,spirv + cargo +nightly doc --target ${{ matrix.target }} --no-deps --features glsl,spirv # all features cargo clippy --target ${{ matrix.target }} --tests --all-features - cargo doc --target ${{ matrix.target }} --no-deps --all-features + cargo +nightly doc --target ${{ matrix.target }} --no-deps --all-features - name: check em if: matrix.kind == 'em' @@ -180,7 +186,7 @@ jobs: cargo clippy --target ${{ matrix.target }} --tests --all-features # build docs - cargo doc --target ${{ matrix.target }} --all-features --no-deps + cargo +nightly doc --target ${{ matrix.target }} --all-features --no-deps # We run minimal checks on the MSRV of the core crates, ensuring that # its dependency tree does not cause issues for firefox. diff --git a/naga/src/front/glsl/token.rs b/naga/src/front/glsl/token.rs index 74f10cbf85..4c3b5d4a25 100644 --- a/naga/src/front/glsl/token.rs +++ b/naga/src/front/glsl/token.rs @@ -1,4 +1,4 @@ -pub use pp_rs::token::{Float, Integer, Location, PreprocessorError, Token as PPToken}; +pub use pp_rs::token::{Float, Integer, Location, Token as PPToken}; use super::ast::Precision; use crate::{Interpolation, Sampling, Span, Type};