Skip to content
This repository was archived by the owner on Jun 18, 2021. It is now read-only.

Commit 27a8911

Browse files
bors[bot]hecrj
andauthored
Merge #245
245: Check `cargo doc` in CI r=kvark a=hecrj This PR makes CI run `cargo doc` using the latest nightly. It is currently panicking here: https://github.com/rust-lang/rust/blob/6dee5f1126dfd5c9314ee5ae9d9eb010e35ef257/src/librustdoc/passes/mod.rs#L411 I thought it was an incorrect link causing it, but the issue seems to persist even after fixing the link. __Update__: Issue opened upstream by @grovesNL (rust-lang/rust#70874). Co-authored-by: Héctor Ramón Jiménez <[email protected]>
2 parents efe44f6 + 8f3580e commit 27a8911

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.travis.yml

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ os:
55
- osx
66
- windows
77

8+
jobs:
9+
include:
10+
- os: linux
11+
rust: nightly
12+
script: cargo doc --lib --no-deps
13+
814
branches:
915
except:
1016
- staging.tmp

src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ impl<'a> RenderPass<'a> {
14721472

14731473
/// Draws primitives from the active vertex buffer(s).
14741474
///
1475-
/// The active vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
1475+
/// The active vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
14761476
pub fn draw(&mut self, vertices: Range<u32>, instances: Range<u32>) {
14771477
unsafe {
14781478
wgn::wgpu_render_pass_draw(
@@ -1488,7 +1488,7 @@ impl<'a> RenderPass<'a> {
14881488
/// Draws indexed primitives using the active index buffer and the active vertex buffers.
14891489
///
14901490
/// The active index buffer can be set with [`RenderPass::set_index_buffer`], while the active
1491-
/// vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
1491+
/// vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
14921492
pub fn draw_indexed(&mut self, indices: Range<u32>, base_vertex: i32, instances: Range<u32>) {
14931493
unsafe {
14941494
wgn::wgpu_render_pass_draw_indexed(
@@ -1504,7 +1504,7 @@ impl<'a> RenderPass<'a> {
15041504

15051505
/// Draws primitives from the active vertex buffer(s) based on the contents of the `indirect_buffer`.
15061506
///
1507-
/// The active vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
1507+
/// The active vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
15081508
pub fn draw_indirect(&mut self, indirect_buffer: &'a Buffer, indirect_offset: BufferAddress) {
15091509
unsafe {
15101510
wgn::wgpu_render_pass_draw_indirect(
@@ -1519,7 +1519,7 @@ impl<'a> RenderPass<'a> {
15191519
/// based on the contents of the `indirect_buffer`.
15201520
///
15211521
/// The active index buffer can be set with [`RenderPass::set_index_buffer`], while the active
1522-
/// vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
1522+
/// vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
15231523
pub fn draw_indexed_indirect(
15241524
&mut self,
15251525
indirect_buffer: &'a Buffer,

0 commit comments

Comments
 (0)