From e370936d1ad30928dd2fa51b2cde759ef0f30a82 Mon Sep 17 00:00:00 2001 From: Marrub Date: Sat, 2 Mar 2019 18:24:05 -0500 Subject: [PATCH] make Color require sized/copy/clone --- src/durandal/image.rs | 6 +++--- src/lib.rs | 6 +++--- src/marathon/shp.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/durandal/image.rs b/src/durandal/image.rs index 22b7845..adfe9bc 100644 --- a/src/durandal/image.rs +++ b/src/durandal/image.rs @@ -100,7 +100,7 @@ pub trait Image } /// Any color which may be represented as RGBA16. -pub trait Color +pub trait Color: Sized + Copy + Clone { /// Returns the red component. fn r(&self) -> u16; @@ -186,11 +186,11 @@ impl Color for Color8 } /// An RGB16 color. -#[derive(Clone, Debug, PartialEq, serde::Serialize)] +#[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)] pub struct Color16(u16, u16, u16); /// An RGB8 color. -#[derive(Clone, Debug, PartialEq, serde::Serialize)] +#[derive(Copy, Clone, Debug, PartialEq, serde::Serialize)] pub struct Color8(u8, u8, u8); /// An RGB16 image. diff --git a/src/lib.rs b/src/lib.rs index faf64a0..b9aaa9c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -#![deny(anonymous_parameters)] // deny deprecated behaviour, warn otherwise +#![deny(anonymous_parameters)] #![deny(bare_trait_objects)] #![deny(elided_lifetimes_in_paths)] #![warn(trivial_casts)] @@ -6,7 +6,7 @@ #![deny(unreachable_pub)] #![warn(unused_import_braces)] #![warn(unused_qualifications)] -#![deny(clippy::all)] // clippy lints, deny all except nontrivial things +#![deny(clippy::all)] #![deny(clippy::clone_on_ref_ptr)] #![deny(clippy::copy_iterator)] #![deny(clippy::decimal_literal_representation)] @@ -18,7 +18,7 @@ #![deny(clippy::explicit_iter_loop)] #![deny(clippy::fallible_impl_from)] #![deny(clippy::filter_map)] -#![deny(clippy::float_arithmetic)] // MUAHAHAHAHAHA +#![deny(clippy::float_arithmetic)] #![deny(clippy::float_cmp_const)] #![deny(clippy::if_not_else)] #![deny(clippy::invalid_upcast_comparisons)] diff --git a/src/marathon/shp.rs b/src/marathon/shp.rs index 67d858a..8aab5b3 100644 --- a/src/marathon/shp.rs +++ b/src/marathon/shp.rs @@ -311,7 +311,7 @@ impl Color for ColorShp } /// A color in an `ImageShp`'s color table. -#[derive(Clone, Debug, serde::Serialize)] +#[derive(Copy, Clone, Debug, serde::Serialize)] pub enum ColorShp { Translucent,