Enable clippy in CI (#2)

* Enable clippy in CI

- Removed beta and nightly channels to prevent build breakage
- Fixed some lints noted by `pedantic` and `nursery` level (but not denying these levels by default)
This commit is contained in:
Jay Oster 2019-10-04 21:35:00 -07:00 committed by GitHub
parent 889d1ae44a
commit 8dc33fcf4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions

View file

@ -3,10 +3,8 @@ rust:
# MSRV # MSRV
- 1.36.0 - 1.36.0
# All of the latest release channels # Stable release channel
- stable - stable
- beta
- nightly
cache: cargo cache: cargo
@ -14,9 +12,10 @@ matrix:
fast_finish: true fast_finish: true
before_script: before_script:
- rustup component add clippy
- rustup component add rustfmt - rustup component add rustfmt
script: script:
- cargo build - cargo clippy -- -D warnings
- cargo test - cargo test
- cargo fmt --all -- --check - cargo fmt --all -- --check

View file

@ -9,6 +9,8 @@
//! your convenience. Use a windowing framework or context manager of your choice; //! your convenience. Use a windowing framework or context manager of your choice;
//! [`winit`](https://crates.io/crates/winit) is a good place to start. //! [`winit`](https://crates.io/crates/winit) is a good place to start.
#![deny(clippy::all)]
use std::cell::RefCell; use std::cell::RefCell;
use std::error::Error as StdError; use std::error::Error as StdError;
use std::fmt; use std::fmt;
@ -61,7 +63,7 @@ pub struct PixelsBuilder<'a> {
renderer_factories: Vec<RenderPassFactory>, renderer_factories: Vec<RenderPassFactory>,
} }
/// Renderer implements RenderPass. /// Renderer implements [`RenderPass`].
#[derive(Debug)] #[derive(Debug)]
struct Renderer { struct Renderer {
device: Rc<wgpu::Device>, device: Rc<wgpu::Device>,
@ -184,7 +186,7 @@ impl RenderPass for Renderer {
let buffer = self let buffer = self
.device .device
.create_buffer_mapped(texels.len(), wgpu::BufferUsage::COPY_SRC) .create_buffer_mapped(texels.len(), wgpu::BufferUsage::COPY_SRC)
.fill_from_slice(&texels); .fill_from_slice(texels);
encoder.copy_buffer_to_texture( encoder.copy_buffer_to_texture(
wgpu::BufferCopyView { wgpu::BufferCopyView {
buffer: &buffer, buffer: &buffer,
@ -277,7 +279,7 @@ impl<'a> PixelsBuilder<'a> {
} }
/// Add options for requesting a [`wgpu::Adapter`]. /// Add options for requesting a [`wgpu::Adapter`].
pub fn request_adapter_options( pub const fn request_adapter_options(
mut self, mut self,
request_adapter_options: wgpu::RequestAdapterOptions, request_adapter_options: wgpu::RequestAdapterOptions,
) -> PixelsBuilder<'a> { ) -> PixelsBuilder<'a> {
@ -286,7 +288,7 @@ impl<'a> PixelsBuilder<'a> {
} }
/// Add options for requesting a [`wgpu::Device`]. /// Add options for requesting a [`wgpu::Device`].
pub fn device_descriptor( pub const fn device_descriptor(
mut self, mut self,
device_descriptor: wgpu::DeviceDescriptor, device_descriptor: wgpu::DeviceDescriptor,
) -> PixelsBuilder<'a> { ) -> PixelsBuilder<'a> {
@ -300,7 +302,7 @@ impl<'a> PixelsBuilder<'a> {
/// factor. /// factor.
/// ///
/// E.g. set this to `8.0 / 7.0` for an 8:7 pixel aspect ratio. /// E.g. set this to `8.0 / 7.0` for an 8:7 pixel aspect ratio.
pub fn pixel_aspect_ratio(mut self, pixel_aspect_ratio: f64) -> PixelsBuilder<'a> { pub const fn pixel_aspect_ratio(mut self, pixel_aspect_ratio: f64) -> PixelsBuilder<'a> {
self.pixel_aspect_ratio = pixel_aspect_ratio; self.pixel_aspect_ratio = pixel_aspect_ratio;
self self
} }
@ -310,7 +312,10 @@ impl<'a> PixelsBuilder<'a> {
/// The default value is [`wgpu::TextureFormat::Rgba8UnormSrgb`], which is 4 unsigned bytes in /// The default value is [`wgpu::TextureFormat::Rgba8UnormSrgb`], which is 4 unsigned bytes in
/// `RGBA` order using the SRGB color space. This is typically what you want when you are /// `RGBA` order using the SRGB color space. This is typically what you want when you are
/// working with color values from popular image editing tools or web apps. /// working with color values from popular image editing tools or web apps.
pub fn texture_format(mut self, texture_format: wgpu::TextureFormat) -> PixelsBuilder<'a> { pub const fn texture_format(
mut self,
texture_format: wgpu::TextureFormat,
) -> PixelsBuilder<'a> {
self.texture_format = texture_format; self.texture_format = texture_format;
self self
} }