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]>
gfx-rs · Apr 9, 2020 · 0c4298b · 0c4298b
2 parents efe44f6 + 0f2bc33
commit 0c4298b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,15 @@ os:
   - osx
   - windows
 
+jobs:
+  include:
+    - os: linux
+      rust: nightly
+      script: cargo doc --lib --no-deps
+  allow_failures:
+    - os: linux
+      rust: nightly
+
 branches:
   except:
   - staging.tmp

diff --git a/src/lib.rs b/src/lib.rs
@@ -1472,7 +1472,7 @@ impl<'a> RenderPass<'a> {
 
     /// Draws primitives from the active vertex buffer(s).
     ///
-    /// The active vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
+    /// The active vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
     pub fn draw(&mut self, vertices: Range<u32>, instances: Range<u32>) {
         unsafe {
             wgn::wgpu_render_pass_draw(
@@ -1488,7 +1488,7 @@ impl<'a> RenderPass<'a> {
     /// Draws indexed primitives using the active index buffer and the active vertex buffers.
     ///
     /// The active index buffer can be set with [`RenderPass::set_index_buffer`], while the active
-    /// vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
+    /// vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
     pub fn draw_indexed(&mut self, indices: Range<u32>, base_vertex: i32, instances: Range<u32>) {
         unsafe {
             wgn::wgpu_render_pass_draw_indexed(
@@ -1504,7 +1504,7 @@ impl<'a> RenderPass<'a> {
 
     /// Draws primitives from the active vertex buffer(s) based on the contents of the `indirect_buffer`.
     ///
-    /// The active vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
+    /// The active vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
     pub fn draw_indirect(&mut self, indirect_buffer: &'a Buffer, indirect_offset: BufferAddress) {
         unsafe {
             wgn::wgpu_render_pass_draw_indirect(
@@ -1519,7 +1519,7 @@ impl<'a> RenderPass<'a> {
     /// based on the contents of the `indirect_buffer`.
     ///
     /// The active index buffer can be set with [`RenderPass::set_index_buffer`], while the active
-    /// vertex buffers can be set with [`RenderPass::set_vertex_buffers`].
+    /// vertex buffers can be set with [`RenderPass::set_vertex_buffer`].
     pub fn draw_indexed_indirect(
         &mut self,
         indirect_buffer: &'a Buffer,