Upgrade dependencies to appease cargo audit and other changes.

Upgrade dependencies to appease cargo audit.
Remove unnecessary lifetime annotations.
Remove unnecessary cast.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "image-rider"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 authors = ["Joshua Gerrish <jgerrish@gmail.com>"]
 description = "Disk image and ROM image parser"
@@ -12,11 +12,11 @@ license = "MIT"
 
 [dependencies]
 config = "0.13"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.4", features = ["derive"] }
 log = "0.4"
-env_logger = "0.9"
+env_logger = "0.10"
 toml = "0.5"
 nom = "7.1"
 
 [dev-dependencies]
-pretty_assertions = "1.3"
+pretty_assertions = "1.4"

src/disk_format/apple/disk.rs

@@ -500,9 +500,9 @@ pub fn volume_parser(guess: AppleDiskGuess, filesize: u64) -> IResult<&[u8], App
 }
 
 /// Parse an Apple ][ Disk
-pub fn apple_disk_parser<'a, 'b>(
+pub fn apple_disk_parser<'a>(
     guess: AppleDiskGuess<'a>,
-    config: &'b Config,
+    config: &Config,
 ) -> IResult<&'a [u8], AppleDisk<'a>> {
     let i = guess.data;
 

src/disk_format/image.rs

@@ -327,10 +327,10 @@ impl DiskImageSaver for DiskImage<'_> {
 }
 
 /// Parses a file given a filename, returning a DiskImage
-pub fn file_parser<'a, 'b>(
+pub fn file_parser<'a>(
     filename: &str,
     data: &'a [u8],
-    config: &'b Config,
+    config: &Config,
 ) -> IResult<&'a [u8], DiskImage<'a>> {
     let guess_image_type = format_from_filename_and_data(filename, data);
 

src/disk_format/stx/mod.rs

@@ -49,7 +49,7 @@ pub fn crc16_add_byte(crc: u16, byte: u8) -> u16 {
     let mut new_crc = crc;
 
     // exclusive or the shifted byte and the current CRC
-    new_crc ^= ((byte as u16) << 8) as u16;
+    new_crc ^= (byte as u16) << 8;
 
     // Rust for-loop iteration is not inclusive on the end
     for _i in 0..8 {