Switch to edition 2021

Author: Palmr

Cargo.toml

@@ -2,6 +2,7 @@
 name = "classfile-parser"
 description = "A parser for Java Class files written in rust"
 version = "0.3.9"
+edition = "2021"
 authors = ["Nick Palmer <nick@palmr.co.uk>"]
 keywords = ["java", "parsing", "class", "classfile"]
 categories = ["parser-implementations"]

src/attribute_info/parser.rs

@@ -7,8 +7,8 @@ use nom::{
     Err as BaseErr,
 };
 
-use attribute_info::types::StackMapFrame::*;
-use attribute_info::*;
+use crate::attribute_info::types::StackMapFrame::*;
+use crate::attribute_info::*;
 
 // Using a type alias here evades a Clippy warning about complex types.
 type Err<E> = BaseErr<Error<E>>;

src/code_attribute/parser.rs

@@ -1,4 +1,4 @@
-use code_attribute::types::Instruction;
+use crate::code_attribute::types::Instruction;
 use nom::{
     bytes::complete::{tag, take},
     combinator::{complete, fail, map, success},

src/constant_info/parser.rs

@@ -1,3 +1,4 @@
+use crate::constant_info::*;
 use nom::{
     bytes::complete::take,
     combinator::map,
@@ -6,8 +7,6 @@ use nom::{
     Err,
 };
 
-use constant_info::*;
-
 fn utf8_constant(input: &[u8]) -> Utf8Constant {
     let utf8_string =
         cesu8::from_java_cesu8(input).unwrap_or_else(|_| String::from_utf8_lossy(input));

src/field_info/parser.rs

@@ -1,8 +1,8 @@
 use nom::{multi::count, number::complete::be_u16, IResult};
 
-use attribute_info::attribute_parser;
+use crate::attribute_info::attribute_parser;
 
-use field_info::{FieldAccessFlags, FieldInfo};
+use crate::field_info::{FieldAccessFlags, FieldInfo};
 
 pub fn field_parser(input: &[u8]) -> IResult<&[u8], FieldInfo> {
     let (input, access_flags) = be_u16(input)?;

src/field_info/types.rs

@@ -1,4 +1,4 @@
-use attribute_info::AttributeInfo;
+use crate::attribute_info::AttributeInfo;
 
 #[derive(Clone, Debug)]
 pub struct FieldInfo {

src/method_info/parser.rs

@@ -1,8 +1,8 @@
 use nom::{multi::count, number::complete::be_u16, IResult};
 
-use attribute_info::attribute_parser;
+use crate::attribute_info::attribute_parser;
 
-use method_info::{MethodAccessFlags, MethodInfo};
+use crate::method_info::{MethodAccessFlags, MethodInfo};
 
 pub fn method_parser(input: &[u8]) -> IResult<&[u8], MethodInfo> {
     let (input, access_flags) = be_u16(input)?;

src/method_info/types.rs

@@ -1,4 +1,4 @@
-use attribute_info::AttributeInfo;
+use crate::attribute_info::AttributeInfo;
 
 #[derive(Clone, Debug)]
 pub struct MethodInfo {

src/parser.rs

@@ -1,12 +1,12 @@
 use nom::*;
 
-use attribute_info::attribute_parser;
-use constant_info::constant_parser;
-use field_info::field_parser;
-use method_info::method_parser;
+use crate::attribute_info::attribute_parser;
+use crate::constant_info::constant_parser;
+use crate::field_info::field_parser;
+use crate::method_info::method_parser;
+use crate::types::{ClassAccessFlags, ClassFile};
 use nom::bytes::complete::tag;
 use nom::multi::count;
-use types::{ClassAccessFlags, ClassFile};
 
 fn magic_parser(input: &[u8]) -> IResult<&[u8], &[u8]> {
     tag(&[0xCA, 0xFE, 0xBA, 0xBE])(input)

src/types.rs

@@ -1,7 +1,7 @@
-use attribute_info::AttributeInfo;
-use constant_info::ConstantInfo;
-use field_info::FieldInfo;
-use method_info::MethodInfo;
+use crate::attribute_info::AttributeInfo;
+use crate::constant_info::ConstantInfo;
+use crate::field_info::FieldInfo;
+use crate::method_info::MethodInfo;
 
 #[derive(Clone, Debug)]
 pub struct ClassFile {