Make several changes recommended by Clippy

Author: ExcaliburZero

Cargo.lock

@@ -59,10 +59,10 @@ impl ClassFile {
 
         let class = self.get_constant(self.this_class as usize);
 
-        if let &ConstantClass { name_index } = class.deref() {
+        if let ConstantClass { name_index } = *class.deref() {
             let class_name = self.get_constant(name_index as usize);
 
-            if let &ConstantUtf8 { ref string } = class_name.deref() {
+            if let ConstantUtf8 { ref string } = *class_name.deref() {
                 string
             } else {
                 panic!("The \"name_index\" pointed to by \"this_class\" did not point to a ConstantUtf8. Found: {:?}", class_name.deref())
@@ -93,7 +93,7 @@ impl ClassFile {
         for ref attr in self.attributes.iter() {
             let name_constant = self.get_constant(attr.attribute_name_index as usize);
 
-            if let &ConstantUtf8 { ref string } = name_constant.deref() {
+            if let ConstantUtf8 { ref string } = *name_constant.deref() {
                 if string == "SourceFile" {
                     if attr.info.len() != 2 {
                         panic!("Incorrectly formatted SourceFile attribute. Expected info length of 2, found: {}", attr.info.len());
@@ -103,8 +103,8 @@ impl ClassFile {
                     let source_file_index = u16::from_be_bytes(info);
                     let source_constant = self.get_constant(source_file_index as usize);
 
-                    if let &ConstantUtf8 { ref string } =
-                        source_constant.deref() { return Some(string) }
+                    if let ConstantUtf8 { ref string } =
+                        *source_constant.deref() { return Some(string) }
                     else {
                         panic!("The \"info\" of the \"SourceFile\" annotation did not point to a ConstantUtf8. Found: {:?}", source_constant.deref());
                     }
@@ -131,7 +131,7 @@ impl ClassFile {
 
         let constant_utf8 = self.get_constant(index);
 
-        if let &ConstantUtf8 { ref string } = constant_utf8.deref() {
+        if let ConstantUtf8 { ref string } = *constant_utf8.deref() {
             string
         } else {
             panic!("Failed to get constant \"#{}\" as a ConstantUtf8. Found: {:?}", index, constant_utf8)
@@ -154,7 +154,7 @@ impl ClassFile {
 
         let constant_class = self.get_constant(index);
 
-        if let &ConstantClass { name_index } = constant_class.deref() {
+        if let ConstantClass { name_index } = *constant_class.deref() {
             self.get_constant_utf8(name_index as usize)
         } else {
             panic!("Failed to get constant \"#{}\" as a ConstantClass. Found: {:?}", index, constant_class)
@@ -181,8 +181,8 @@ impl ClassFile {
 
         let constant_nat = self.get_constant(index);
 
-        if let &ConstantNameAndType { name_index, descriptor_index } =
-                constant_nat.deref() {
+        if let ConstantNameAndType { name_index, descriptor_index } =
+                *constant_nat.deref() {
             format!(
                 "\"{}\":{}",
                 self.get_constant_utf8(name_index as usize),

src/class_file.rs

@@ -78,27 +78,27 @@ fn print_constant_pool(class_file: &ClassFile) {
 }
 
 fn format_constant_pool_entry(
-        class_file: &ClassFile, constant: &Box<ConstantPoolEntry>
+        class_file: &ClassFile, constant: &ConstantPoolEntry
     ) -> String {
     use ConstantPoolEntry::*;
 
-    match constant.deref() {
-        &ConstantUtf8 { ref string } => {
+    match *constant.deref() {
+        ConstantUtf8 { ref string } => {
             format!(
                 "{:<20}{}",
                 "Utf8",
                 string
             )
         },
-        &ConstantClass { name_index } => {
+        ConstantClass { name_index } => {
             format!(
                 "{:<20}{:<16}// {}",
                 "Class",
                 format!("#{}", name_index),
                 class_file.get_constant_utf8(name_index as usize)
             )
         },
-        &ConstantFieldref { class_index, name_and_type_index } => {
+        ConstantFieldref { class_index, name_and_type_index } => {
             format!(
                 "{:<20}{:<16}// {}",
                 "Fieldref",
@@ -112,7 +112,7 @@ fn format_constant_pool_entry(
                 )
             )
         },
-        &ConstantMethodref { class_index, name_and_type_index } => {
+        ConstantMethodref { class_index, name_and_type_index } => {
             format!(
                 "{:<20}{:<16}// {}",
                 "Methodref",
@@ -126,7 +126,7 @@ fn format_constant_pool_entry(
                 )
             )
         },
-        &ConstantNameAndType { name_index, descriptor_index } => {
+        ConstantNameAndType { name_index, descriptor_index } => {
             format!(
                 "{:<20}{:<16}// {}",
                 "NameAndType",
@@ -172,12 +172,12 @@ fn print_method(class_file: &ClassFile, method: &Method) {
 
     print_bytecode(class_file, &code.code);
 
-    if code.exception_table.len() > 0 {
+    if !code.exception_table.is_empty() {
         print_exception_table(class_file, &code.exception_table);
     }
 }
 
-fn print_bytecode(class_file: &ClassFile, code: &Vec<(usize, Bytecode)>) {
+fn print_bytecode(class_file: &ClassFile, code: &[(usize, Bytecode)]) {
     for (i, bytecode) in code {
         print!(
             "        {:>3}: {:35}",
@@ -192,7 +192,7 @@ fn print_bytecode(class_file: &ClassFile, code: &Vec<(usize, Bytecode)>) {
 }
 
 fn print_exception_table(
-        class_file: &ClassFile, exception_table: &Vec<ExceptionTableEntry>
+        class_file: &ClassFile, exception_table: &[ExceptionTableEntry]
     ) {
     println!("      Exception table:");
     println!("         from    to  target type");

src/main.rs

@@ -21,7 +21,7 @@ impl Method {
                 attr.attribute_name_index as usize
             );
 
-            if let &ConstantUtf8 { ref string } = name_constant.deref() {
+            if let ConstantUtf8 { ref string } = *name_constant.deref() {
                 if string == "Code" {
                     return Some(Code::from_bytes(&attr.info))
                 }

src/method.rs

@@ -9,7 +9,7 @@ use constant_pool::*;
 use field::*;
 use method::*;
 
-const EXPECTED_MAGIC: u32 = 0xCAFEBABE;
+const EXPECTED_MAGIC: u32 = 0xCAFE_BABE;
 
 const CONSTANT_TAG_UTF8: u8 = 1;
 const CONSTANT_TAG_CLASS: u8 = 7;
@@ -57,23 +57,23 @@ pub fn read_class_file(file: &mut File) -> io::Result<ClassFile> {
 fn read_u8(file: &mut File) -> io::Result<u8> {
     let mut buffer = [0; 1];
 
-    file.read(&mut buffer)?;
+    file.read_exact(&mut buffer)?;
 
     Ok(u8::from_be_bytes(buffer))
 }
 
 fn read_u16(file: &mut File) -> io::Result<u16> {
     let mut buffer = [0; 2];
 
-    file.read(&mut buffer)?;
+    file.read_exact(&mut buffer)?;
 
     Ok(u16::from_be_bytes(buffer))
 }
 
 fn read_u32(file: &mut File) -> io::Result<u32> {
     let mut buffer = [0; 4];
 
-    file.read(&mut buffer)?;
+    file.read_exact(&mut buffer)?;
 
     Ok(u32::from_be_bytes(buffer))
 }
@@ -87,7 +87,7 @@ fn read_n_bytes(file: &mut File, length: usize) -> io::Result<Vec<u8>> {
 }
 
 fn read_constant_pool(file: &mut File) -> io::Result<Vec<Box<ConstantPoolEntry>>> {
-    let constant_pool_count = read_u16(file)? as i32;
+    let constant_pool_count = i32::from(read_u16(file)?);
 
     let mut constant_pool = Vec::<Box<ConstantPoolEntry>>::new();
 
@@ -172,7 +172,7 @@ fn read_constant_name_and_type(file: &mut File) -> io::Result<ConstantPoolEntry>
 }
 
 fn read_interfaces(file: &mut File) -> io::Result<Vec<u16>> {
-    let interfaces_count = read_u16(file)? as i32;
+    let interfaces_count = i32::from(read_u16(file)?);
 
     let mut interfaces = Vec::<u16>::new();
 
@@ -186,7 +186,7 @@ fn read_interfaces(file: &mut File) -> io::Result<Vec<u16>> {
 }
 
 fn read_fields(file: &mut File) -> io::Result<Vec<Field>> {
-    let fields_count = read_u16(file)? as i32;
+    let fields_count = i32::from(read_u16(file)?);
 
     let mut fields = Vec::<Field>::new();
 
@@ -215,7 +215,7 @@ fn read_field(file: &mut File) -> io::Result<Field> {
 }
 
 fn read_methods(file: &mut File) -> io::Result<Vec<Method>> {
-    let methods_count = read_u16(file)? as i32;
+    let methods_count = i32::from(read_u16(file)?);
 
     let mut methods = Vec::<Method>::new();