Skip to content

address some lints #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
danieleades wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

address some lints #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 33 additions & 40 deletions speedy-derive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,22 +88,19 @@ fn possibly_uses_generic_ty( generic_types: &[&syn::Ident], ty: &syn::Type ) ->
}
})
},
syn::Type::Slice( syn::TypeSlice { elem, .. } ) => possibly_uses_generic_ty( generic_types, &elem ),
syn::Type::Slice( syn::TypeSlice { elem, .. } ) => possibly_uses_generic_ty( generic_types, elem ),
syn::Type::Tuple( syn::TypeTuple { elems, .. } ) => elems.iter().any( |elem| possibly_uses_generic_ty( generic_types, elem ) ),
syn::Type::Reference( syn::TypeReference { elem, .. } ) => possibly_uses_generic_ty( generic_types, &elem ),
syn::Type::Paren( syn::TypeParen { elem, .. } ) => possibly_uses_generic_ty( generic_types, &elem ),
syn::Type::Ptr( syn::TypePtr { elem, .. } ) => possibly_uses_generic_ty( generic_types, &elem ),
syn::Type::Group( syn::TypeGroup { elem, .. } ) => possibly_uses_generic_ty( generic_types, &elem ),
syn::Type::Reference( syn::TypeReference { elem, .. } ) => possibly_uses_generic_ty( generic_types, elem ),
syn::Type::Paren( syn::TypeParen { elem, .. } ) => possibly_uses_generic_ty( generic_types, elem ),
syn::Type::Ptr( syn::TypePtr { elem, .. } ) => possibly_uses_generic_ty( generic_types, elem ),
syn::Type::Group( syn::TypeGroup { elem, .. } ) => possibly_uses_generic_ty( generic_types, elem ),
syn::Type::Array( syn::TypeArray { elem, len, .. } ) => {
if possibly_uses_generic_ty( generic_types, &elem ) {
if possibly_uses_generic_ty( generic_types, elem ) {
return true;
}

// This is probably too conservative.
match len {
syn::Expr::Lit( .. ) => false,
_ => true
}
!matches!(len, syn::Expr::Lit( .. ))
},
syn::Type::Never( .. ) => false,
_ => true
Expand All @@ -112,6 +109,7 @@ fn possibly_uses_generic_ty( generic_types: &[&syn::Ident], ty: &syn::Type ) ->

#[test]
fn test_possibly_uses_generic_ty() {
#![allow(clippy::bool_assert_comparison)]
macro_rules! assert_test {
($result:expr, $($token:tt)+) => {
assert_eq!(
Expand Down Expand Up @@ -177,22 +175,19 @@ fn is_guaranteed_non_recursive( ty: &syn::Type ) -> bool {
_ => false
}
},
syn::Type::Slice( syn::TypeSlice { elem, .. } ) => is_guaranteed_non_recursive( &elem ),
syn::Type::Tuple( syn::TypeTuple { elems, .. } ) => elems.iter().all( |elem| is_guaranteed_non_recursive( elem ) ),
syn::Type::Reference( syn::TypeReference { elem, .. } ) => is_guaranteed_non_recursive( &elem ),
syn::Type::Paren( syn::TypeParen { elem, .. } ) => is_guaranteed_non_recursive( &elem ),
syn::Type::Ptr( syn::TypePtr { elem, .. } ) => is_guaranteed_non_recursive( &elem ),
syn::Type::Group( syn::TypeGroup { elem, .. } ) => is_guaranteed_non_recursive( &elem ),
syn::Type::Slice( syn::TypeSlice { elem, .. } ) => is_guaranteed_non_recursive( elem ),
syn::Type::Tuple( syn::TypeTuple { elems, .. } ) => elems.iter().all( is_guaranteed_non_recursive ),
syn::Type::Reference( syn::TypeReference { elem, .. } ) => is_guaranteed_non_recursive( elem ),
syn::Type::Paren( syn::TypeParen { elem, .. } ) => is_guaranteed_non_recursive( elem ),
syn::Type::Ptr( syn::TypePtr { elem, .. } ) => is_guaranteed_non_recursive( elem ),
syn::Type::Group( syn::TypeGroup { elem, .. } ) => is_guaranteed_non_recursive( elem ),
syn::Type::Array( syn::TypeArray { elem, len, .. } ) => {
if !is_guaranteed_non_recursive( &elem ) {
if !is_guaranteed_non_recursive( elem ) {
return false;
}

// This is probably too conservative.
match len {
syn::Expr::Lit( .. ) => true,
_ => false
}
matches!(len, syn::Expr::Lit( .. ))
},
syn::Type::Never( .. ) => true,
_ => false
Expand All @@ -201,6 +196,7 @@ fn is_guaranteed_non_recursive( ty: &syn::Type ) -> bool {

#[test]
fn test_is_guaranteed_non_recursive() {
#![allow(clippy::bool_assert_comparison)]
macro_rules! assert_test {
($result:expr, $($token:tt)+) => {
assert_eq!(
Expand Down Expand Up @@ -635,7 +631,7 @@ impl< 'a > Field< 'a > {
}

fn is_guaranteed_non_recursive( &self ) -> bool {
is_guaranteed_non_recursive( &self.raw_ty )
is_guaranteed_non_recursive( self.raw_ty )
}
}

Expand Down Expand Up @@ -724,7 +720,7 @@ impl syn::parse::Parse for FieldAttribute {
match literal {
syn::Lit::Int( literal ) => {
if literal.suffix() == "i8" {
vec![ (literal.base10_parse::< i8 >().unwrap() * -1) as u8 ]
vec![ (-literal.base10_parse::< i8 >().unwrap()) as u8 ]
} else if literal.suffix() == "u8" {
return generic_error()
} else {
Expand Down Expand Up @@ -1010,10 +1006,11 @@ fn get_fields< 'a, I: IntoIterator< Item = &'a syn::Field > + 'a >( fields: I )
}
}

if length_type.is_some() && length.is_some() {
let (key_span, _) = length_type.unwrap();
let message = "You cannot have both 'length_type' and 'length' on the same field";
return Err( syn::Error::new( key_span, message ) );
if length.is_some() {
if let Some((key_span, _)) = length_type {
let message = "You cannot have both 'length_type' and 'length' on the same field";
return Err( syn::Error::new( key_span, message ) );
}
}

let ty = if let Some( ty ) = extract_option_inner_ty( &field.ty ) {
Expand Down Expand Up @@ -1282,7 +1279,7 @@ fn readable_body< 'a >( types: &mut Vec< syn::Type >, st: &Struct< 'a > ) -> (To
field_names.push( name );
types.extend( field.bound_types() );

if let Some( minimum_bytes ) = get_minimum_bytes( &field ) {
if let Some( minimum_bytes ) = get_minimum_bytes( field ) {
minimum_bytes_needed.push( minimum_bytes );
}
}
Expand Down Expand Up @@ -1382,16 +1379,14 @@ fn write_field_body( field: &Field ) -> TokenStream {
Opt::Option( _ ) => write_option( body )
};

let body = if let Some( ref constant_prefix ) = field.constant_prefix {
if let Some( ref constant_prefix ) = field.constant_prefix {
quote! {{
_writer_.write_slice( #constant_prefix )?;
#body
}}
} else {
body
};

body
}
}

fn writable_body< 'a >( types: &mut Vec< syn::Type >, st: &Struct< 'a > ) -> (TokenStream, TokenStream) {
Expand All @@ -1402,7 +1397,7 @@ fn writable_body< 'a >( types: &mut Vec< syn::Type >, st: &Struct< 'a > ) -> (To
continue;
}

let write_value = write_field_body( &field );
let write_value = write_field_body( field );
types.extend( field.bound_types() );

field_names.push( field.var_name().clone() );
Expand Down Expand Up @@ -1442,7 +1437,7 @@ impl< 'a > Enum< 'a > {
let attrs = collect_enum_attributes( attrs )?;
let tag_type = attrs.tag_type.unwrap_or( DEFAULT_ENUM_TAG_TYPE );
let max = match tag_type {
BasicType::U7 => 0b01111111 as u64,
BasicType::U7 => 0b01111111_u64,
BasicType::U8 => std::u8::MAX as u64,
BasicType::U16 => std::u16::MAX as u64,
BasicType::U32 => std::u32::MAX as u64,
Expand Down Expand Up @@ -1647,7 +1642,7 @@ fn impl_readable( input: syn::DeriveInput ) -> Result< TokenStream, syn::Error >
(reader_body, minimum_bytes)
},
syn::Data::Enum( syn::DataEnum { variants, .. } ) => {
let enumeration = Enum::new( &name, &input.attrs, &variants )?;
let enumeration = Enum::new( name, &input.attrs, variants )?;
let mut variant_matches = Vec::with_capacity( variants.len() );
let mut variant_minimum_sizes = Vec::with_capacity( variants.len() );
for variant in enumeration.variants {
Expand All @@ -1662,10 +1657,8 @@ fn impl_readable( input: syn::DeriveInput ) -> Result< TokenStream, syn::Error >
}
});

if variant.structure.kind != StructKind::Unit {
if variant.structure.is_guaranteed_non_recursive() {
variant_minimum_sizes.push( minimum_bytes );
}
if variant.structure.kind != StructKind::Unit && variant.structure.is_guaranteed_non_recursive() {
variant_minimum_sizes.push( minimum_bytes );
}
}

Expand Down Expand Up @@ -1798,7 +1791,7 @@ fn impl_writable( input: syn::DeriveInput ) -> Result< TokenStream, syn::Error >
}
},
syn::Data::Enum( syn::DataEnum { ref variants, .. } ) => {
let enumeration = Enum::new( &name, &input.attrs, &variants )?;
let enumeration = Enum::new( name, &input.attrs, variants )?;
let tag_writer = match enumeration.tag_type {
BasicType::U64 => quote! { write_u64 },
BasicType::U32 => quote! { write_u32 },
Expand Down
10 changes: 5 additions & 5 deletions src/circular_buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ impl CircularBuffer {

self.buffer[ range_1.clone() ].copy_from_slice( &slice[ ..range_1.len() ] );
if let Some( range_2 ) = range_2 {
self.buffer[ range_2.clone() ].copy_from_slice( &slice[ range_1.len().. ] );
self.buffer[ range_2 ].copy_from_slice( &slice[ range_1.len().. ] );
}

self.length += slice.len();
Expand Down Expand Up @@ -391,17 +391,17 @@ fn test_circular_buffer_basic() {
let mut buf = CircularBuffer::new();
assert_eq!( buf.len(), 0 );
assert_eq!( buf.capacity(), 0 );
assert_eq!( buf.is_empty(), true );
assert!( buf.is_empty() );

buf.reserve_exact( 3 );
assert_eq!( buf.len(), 0 );
assert_eq!( buf.capacity(), 3 );
assert_eq!( buf.is_empty(), true );
assert!( buf.is_empty() );

buf.extend_from_slice( &[1, 2] );
assert_eq!( buf.len(), 2 );
assert_eq!( buf.capacity(), 3 );
assert_eq!( buf.is_empty(), false );
assert!( !buf.is_empty() );
assert_eq!( buf.as_slices(), (&[1, 2][..], None) );
assert_eq!( buf.to_vec(), vec![1, 2] );
assert_eq!( buf.as_slices_of_length(0), (&[][..], None) );
Expand Down Expand Up @@ -505,7 +505,7 @@ quickcheck::quickcheck! {
assert_eq!( buffer.len(), control_buffer.len() );
assert_eq!( buffer.to_vec(), control_buffer );

if buffer.len() > 0 {
if !buffer.is_empty() {
let expected = control_buffer.remove( 0 );
let mut actual = [!expected];
buffer.consume_into( &mut actual );
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ mod tests {

impl io::Read for TestStream {
fn read( &mut self, output: &mut [u8] ) -> Result< usize, io::Error > {
if self.position >= self.buffer.len() || output.len() == 0 {
if self.position >= self.buffer.len() || output.is_empty() {
return Ok(0);
}

Expand Down
4 changes: 2 additions & 2 deletions src/readable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,12 @@ impl< 'ctx, 'r, 'a, C: Context > Reader< 'r, C > for CopyingBufferReader< 'ctx,

#[inline(always)]
fn context( &self ) -> &C {
&self.context
self.context
}

#[inline(always)]
fn context_mut( &mut self ) -> &mut C {
&mut self.context
self.context
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ pub trait Reader< 'a, C: Context >: Sized {
let length = vec.len();
unsafe {
vec.set_len( length + 1 );
std::ptr::write( vec.as_mut_ptr().offset( length as isize ), value );
std::ptr::write( vec.as_mut_ptr().add(length), value );
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/writable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ impl< 'a, C: Context > Writer< C > for BufferCollector< 'a, C > {

#[inline]
fn context( &self ) -> &C {
&self.context
self.context
}

#[inline]
fn context_mut( &mut self ) -> &mut C {
&mut self.context
self.context
}

#[inline(always)]
Expand Down