update generic-array

.github/workflows/ci-version.yml

@@ -41,7 +41,7 @@ jobs:
           - macos-latest
           - windows-latest
         toolchain:
-          - 1.57
+          - "1.60"
         features:
           -
     name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
           - macos-latest
           - windows-latest
         toolchain:
-          - 1.57
+          - "1.60"
         features:
           -
     name: Test ${{ matrix.toolchain }} on ${{ matrix.os }} (${{ matrix.features }})

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "base64-stream"
-version = "2.0.0"
+version = "3.0.0"
 authors = ["Magic Len <[email protected]>"]
 edition = "2021"
-rust-version = "1.57"
+rust-version = "1.60"
 repository = "https://github.com/magiclen/base64-stream"
 homepage = "https://magiclen.org/base64-stream"
 keywords = ["base64", "stream", "file", "reader", "writer"]
@@ -14,7 +14,7 @@ include = ["src/**/*", "Cargo.toml", "README.md", "LICENSE"]
 
 [dependencies]
 base64 = "0.21"
-generic-array = "0.14"
+generic-array = "1"
 
 [dependencies.educe]
 version = ">=0.4.0"

src/from_base64_reader.rs

@@ -15,10 +15,7 @@ use generic_array::{
 /// Read base64 data and decode them to plain data.
 #[derive(Educe)]
 #[educe(Debug)]
-pub struct FromBase64Reader<
-    R: Read,
-    N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True> = U4096,
-> {
+pub struct FromBase64Reader<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True> = U4096> {
     #[educe(Debug(ignore))]
     inner:       R,
     buf:         GenericArray<u8, N>,
@@ -37,7 +34,7 @@ impl<R: Read> FromBase64Reader<R> {
     }
 }
 
-impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBase64Reader<R, N> {
+impl<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> FromBase64Reader<R, N> {
     #[inline]
     pub fn new2(reader: R) -> FromBase64Reader<R, N> {
         FromBase64Reader {
@@ -52,7 +49,7 @@ impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBase
     }
 }
 
-impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBase64Reader<R, N> {
+impl<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> FromBase64Reader<R, N> {
     fn buf_left_shift(&mut self, distance: usize) {
         debug_assert!(self.buf_length >= distance);
 
@@ -197,7 +194,7 @@ impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBase
     }
 }
 
-impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> Read
+impl<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> Read
     for FromBase64Reader<R, N>
 {
     fn read(&mut self, mut buf: &mut [u8]) -> Result<usize, io::Error> {

src/from_base64_writer.rs

@@ -15,10 +15,8 @@ use generic_array::{
 /// Write base64 data and decode them to plain data.
 #[derive(Educe)]
 #[educe(Debug)]
-pub struct FromBase64Writer<
-    W: Write,
-    N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True> = U4096,
-> {
+pub struct FromBase64Writer<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True> = U4096>
+{
     #[educe(Debug(ignore))]
     inner:      W,
     buf:        [u8; 4],
@@ -35,7 +33,7 @@ impl<W: Write> FromBase64Writer<W> {
     }
 }
 
-impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBase64Writer<W, N> {
+impl<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> FromBase64Writer<W, N> {
     #[inline]
     pub fn new2(writer: W) -> FromBase64Writer<W, N> {
         FromBase64Writer {
@@ -48,7 +46,7 @@ impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBas
     }
 }
 
-impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBase64Writer<W, N> {
+impl<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> FromBase64Writer<W, N> {
     fn drain_block(&mut self) -> Result<(), io::Error> {
         debug_assert!(self.buf_length > 0);
 
@@ -65,7 +63,7 @@ impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> FromBas
     }
 }
 
-impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> Write
+impl<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> Write
     for FromBase64Writer<W, N>
 {
     fn write(&mut self, mut buf: &[u8]) -> Result<usize, io::Error> {

src/to_base64_reader.rs

@@ -15,8 +15,7 @@ use generic_array::{
 /// Read any data and encode them to base64 data.
 #[derive(Educe)]
 #[educe(Debug)]
-pub struct ToBase64Reader<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True> = U4096>
-{
+pub struct ToBase64Reader<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True> = U4096> {
     #[educe(Debug(ignore))]
     inner:       R,
     buf:         GenericArray<u8, N>,
@@ -35,7 +34,7 @@ impl<R: Read> ToBase64Reader<R> {
     }
 }
 
-impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase64Reader<R, N> {
+impl<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> ToBase64Reader<R, N> {
     #[inline]
     pub fn new2(reader: R) -> ToBase64Reader<R, N> {
         ToBase64Reader {
@@ -50,7 +49,7 @@ impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase64
     }
 }
 
-impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase64Reader<R, N> {
+impl<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> ToBase64Reader<R, N> {
     fn buf_left_shift(&mut self, distance: usize) {
         debug_assert!(self.buf_length >= distance);
 
@@ -197,9 +196,7 @@ impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase64
     }
 }
 
-impl<R: Read, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> Read
-    for ToBase64Reader<R, N>
-{
+impl<R: Read, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> Read for ToBase64Reader<R, N> {
     fn read(&mut self, mut buf: &mut [u8]) -> Result<usize, io::Error> {
         let original_buf_length = buf.len();
 

src/to_base64_writer.rs

@@ -15,10 +15,7 @@ use generic_array::{
 /// Write base64 data and encode them to plain data.
 #[derive(Educe)]
 #[educe(Debug)]
-pub struct ToBase64Writer<
-    W: Write,
-    N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True> = U4096,
-> {
+pub struct ToBase64Writer<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True> = U4096> {
     #[educe(Debug(ignore))]
     inner:      W,
     buf:        [u8; 3],
@@ -35,7 +32,7 @@ impl<W: Write> ToBase64Writer<W> {
     }
 }
 
-impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase64Writer<W, N> {
+impl<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> ToBase64Writer<W, N> {
     #[inline]
     pub fn new2(writer: W) -> ToBase64Writer<W, N> {
         ToBase64Writer {
@@ -48,7 +45,7 @@ impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase6
     }
 }
 
-impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase64Writer<W, N> {
+impl<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> ToBase64Writer<W, N> {
     fn drain_block(&mut self) -> Result<(), io::Error> {
         debug_assert!(self.buf_length > 0);
 
@@ -63,7 +60,7 @@ impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> ToBase6
     }
 }
 
-impl<W: Write, N: ArrayLength<u8> + IsGreaterOrEqual<U4, Output = True>> Write
+impl<W: Write, N: ArrayLength + IsGreaterOrEqual<U4, Output = True>> Write
     for ToBase64Writer<W, N>
 {
     fn write(&mut self, mut buf: &[u8]) -> Result<usize, io::Error> {