From 9eb0f72df2adce011fdafa25d9904b16abeac7d3 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sat, 18 Mar 2023 20:43:39 +0100 Subject: [PATCH 1/2] refactor: switch from buf_redux to buffer-redux Closes #213 --- Cargo.toml | 5 ++--- src/armor/reader.rs | 2 +- src/base64_decoder.rs | 2 +- src/packet/many.rs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0064f1be..5d286ae0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,9 +57,8 @@ twofish = "^0.7" zeroize = { version = "1.5", features = ["zeroize_derive"] } getrandom = { version = "0.2.6", optional = true } -[dependencies.buf_redux] -version = "0.8.4" -default-features = false +[dependencies.buffer-redux] +version = "1.0.0" [dependencies.ed25519-dalek] version = "2.0.0-pre.0" diff --git a/src/armor/reader.rs b/src/armor/reader.rs index 10c80616..15a1bc5b 100644 --- a/src/armor/reader.rs +++ b/src/armor/reader.rs @@ -4,7 +4,7 @@ use std::io::prelude::*; use std::{fmt, io, str}; use base64::engine::{general_purpose::STANDARD, Engine as _}; -use buf_redux::BufReader; +use buffer_redux::BufReader; use byteorder::{BigEndian, ByteOrder}; use nom::branch::alt; diff --git a/src/base64_decoder.rs b/src/base64_decoder.rs index 6ec2c2f3..626f10da 100644 --- a/src/base64_decoder.rs +++ b/src/base64_decoder.rs @@ -10,7 +10,7 @@ use base64::{ Engine, }, }; -use buf_redux::{BufReader, Buffer}; +use buffer_redux::{BufReader, Buffer}; const BUF_SIZE: usize = 1024; const BUF_CAPACITY: usize = BUF_SIZE / 4 * 3; diff --git a/src/packet/many.rs b/src/packet/many.rs index ad5b0bdc..163f81ba 100644 --- a/src/packet/many.rs +++ b/src/packet/many.rs @@ -1,6 +1,6 @@ use std::io::Read; -use buf_redux::Buffer; +use buffer_redux::Buffer; use nom::{Needed, Offset}; use crate::errors::{Error, Result}; From 271f1150113ef5564218967605a53f0a16ffdec4 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Sun, 19 Mar 2023 12:59:02 +0100 Subject: [PATCH 2/2] disable default features by default --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 5d286ae0..d3ef310c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,6 +59,7 @@ getrandom = { version = "0.2.6", optional = true } [dependencies.buffer-redux] version = "1.0.0" +default-features = false [dependencies.ed25519-dalek] version = "2.0.0-pre.0"