Updat to Rust edition 2024

And fix all clippy warnings.

Author: FlashSystems

Cargo.toml

@@ -6,7 +6,7 @@ keywords = [ "protocol", "fastcgi", "web", "tokio", "async" ]
 categories = [ "web-programming", "network-programming", "asynchronous" ]
 version = "1.2.0"
 authors = ["Daniel Goß <developer@flashsystems.de>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/FlashSystems/tokio-fastcgi"
 repository = "https://github.com/FlashSystems/tokio-fastcgi"
 readme = "README.md"

src/lib.rs

@@ -542,7 +542,7 @@ impl <W: AsyncWrite + Unpin> Request<W> {
 			let length_byte2 = u32::from(src.read_u8()?);
 			let length_byte10 = u32::from(src.read_u16::<BigEndian>()?);
 
-			Ok((length & 0x7f) << 24 | length_byte2 << 16 | length_byte10)
+			Ok(((length & 0x7f) << 24) | (length_byte2 << 16) | length_byte10)
 		}
 	}
 
@@ -977,7 +977,7 @@ pub struct Requests <R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send>
 	max_reqs: u8
 }
 
-impl <'w, R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> Requests<R, W> {
+impl <R: AsyncRead + Unpin + Send, W: AsyncWrite + Unpin + Send> Requests<R, W> {
 	/// Creates a new [`Requests`] instance.
 	///
 	/// As soon as a new connection is accepted the read and write parts of this
@@ -1302,11 +1302,11 @@ impl <W: AsyncWrite + Unpin> OutStream<W> {
 
 		// Check if the data can be transmitted in one chunk.
 		// If not, split the data in chunks of u16 - 1 size.
-		if data.len() < u16::max_value() as usize {
+		if data.len() < u16::MAX as usize {
 			Ok(self.orw.write_data(self.record_type, data).await?)
 		} else {
 			// Transmit large streams in junks of 64k
-			const JUNK_SIZE: usize = (u16::max_value() - 1) as usize;
+			const JUNK_SIZE: usize = (u16::MAX - 1) as usize;
 			for offset in (0..data.len()).step_by(JUNK_SIZE) {
 				self.orw.write_data(self.record_type, &data[offset..(offset + JUNK_SIZE).min(data.len())]).await?;
 			}

tests/commons.rs

@@ -45,10 +45,10 @@ pub enum RecordFlags {
 pub fn create_record(request_type: RecordType, request_id: u8, padding: u8, data: &[u8]) -> Vec<u8> {
 	let content_length = data.len() as u16;
 
-	let mut record = vec![0x01, request_type as u8, 0x00, request_id, (content_length >> 8 & 0xFF) as u8, (content_length & 0xFF) as u8, padding, 0x00];
+	let mut record = vec![0x01, request_type as u8, 0x00, request_id, ((content_length >> 8) & 0xFF) as u8, (content_length & 0xFF) as u8, padding, 0x00];
 
 	record.extend_from_slice(data);
-	record.extend_from_slice(&*vec![0u8; padding as usize]);
+	record.extend_from_slice(&vec![0u8; padding as usize]);
 
 	record
 }
@@ -86,14 +86,14 @@ impl TestCase for TestParamsInOut {
 		// Check the parameters
 		let sp = request.get_param("SERVER_PORT");
 		assert!(sp.is_some());
-		assert_eq!(sp.unwrap(), &[b'8', b'0']);
+		assert_eq!(sp.unwrap(), b"80");
 		let sp = request.get_str_param("SERVER_PORT");
 		assert!(sp.is_some());
 		assert_eq!(sp.unwrap(), "80");
 
 		let tst = request.get_param("TEST");
 		assert!(tst.is_some());
-		assert_eq!(tst.unwrap(), &[b'Y', b'E', b'S']);
+		assert_eq!(tst.unwrap(), b"YES");
 		let tst = request.get_str_param("TEST");
 		assert!(tst.is_some());
 		assert_eq!(tst.unwrap(), "YES");
@@ -112,9 +112,9 @@ impl TestCase for TestParamsInOut {
 		assert_eq!(params[0].0, "noutf8");
 		assert_eq!(params[0].1, &[b'N', b'O', 0xF0]);
 		assert_eq!(params[1].0, "server_port");
-		assert_eq!(params[1].1, &[b'8', b'0']);
+		assert_eq!(params[1].1, b"80");
 		assert_eq!(params[2].0, "test");
-		assert_eq!(params[2].1, &[b'Y', b'E', b'S']);
+		assert_eq!(params[2].1, b"YES");
 
 		// Test the string params iterator
 		let mut params: Vec<(&str, Option<&str>)> = request.str_params_iter().unwrap().collect();