Commit f6135ebf authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'misc-upgrades' into 'main' 

Upgrade several dependencies

See merge request tpo/core/arti!1626
parents bbc83247 34766342

Cargo.lock

+27 −17
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ version = "0.5.1" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"

dependencies = [

 "event-listener",

 "event-listener 2.5.3",

 "futures-core",

]
@@ -429,7 +429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"

dependencies = [

 "concurrent-queue",

 "event-listener",

 "event-listener 2.5.3",

 "futures-core",

]
@@ -513,7 +513,7 @@ version = "2.8.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"

dependencies = [

 "event-listener",

 "event-listener 2.5.3",

]



[[package]]
@@ -539,7 +539,7 @@ dependencies = [ 
 "autocfg",

 "blocking",

 "cfg-if",

 "event-listener",

 "event-listener 2.5.3",

 "futures-lite",

 "rustix 0.37.23",

 "signal-hook",
@@ -602,9 +602,9 @@ dependencies = [ 


[[package]]

name = "async_executors"

version = "0.6.0"

version = "0.7.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "c0b2463773401e1f684136f9cdb956cf611f22172472cf3f049e72123f59e359"

checksum = "a982d2f86de6137cc05c9db9a915a19886c97911f9790d04f174cede74be01a5"

dependencies = [

 "async-std",

 "blanket",
@@ -771,13 +771,13 @@ dependencies = [ 


[[package]]

name = "blanket"

version = "0.2.0"

version = "0.3.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "7b04ce3d2372d05d1ef4ea3fdf427da6ae3c17ca06d688a107b5344836276bc3"

checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"

dependencies = [

 "proc-macro2",

 "quote",

 "syn 1.0.109",

 "syn 2.0.31",

]



[[package]]
@@ -1638,6 +1638,17 @@ version = "2.5.3" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"



[[package]]

name = "event-listener"

version = "3.0.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325"

dependencies = [

 "concurrent-queue",

 "parking",

 "pin-project-lite",

]



[[package]]

name = "fallible-iterator"

version = "0.2.0"
@@ -1652,11 +1663,12 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" 


[[package]]

name = "fast-socks5"

version = "0.8.2"

version = "0.9.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "961ce1761191c157145a8c9f0c3ceabecd3a729d65c9a8d443674eaee3420f7e"

checksum = "aa6a4a9ab1f87e2d8e9345ce944de7c45d065ee89f5942512f32698e48a8429a"

dependencies = [

 "anyhow",

 "async-trait",

 "log",

 "thiserror",

 "tokio",
@@ -2486,9 +2498,9 @@ dependencies = [ 


[[package]]

name = "memmap2"

version = "0.7.1"

version = "0.8.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"

checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"

dependencies = [

 "libc",

]
@@ -4505,7 +4517,6 @@ dependencies = [ 
 "bytes",

 "digest 0.10.7",

 "educe",

 "generic-array",

 "getrandom 0.2.10",

 "hex-literal",

 "signature 1.6.4",
@@ -4738,7 +4749,7 @@ dependencies = [ 
 "derive_more",

 "digest 0.10.7",

 "educe",

 "event-listener",

 "event-listener 3.0.0",

 "float_eq",

 "fs-mistrust",

 "fslock",
@@ -4748,7 +4759,7 @@ dependencies = [ 
 "humantime 2.1.0",

 "humantime-serde",

 "itertools",

 "memmap2 0.7.1",

 "memmap2 0.8.0",

 "once_cell",

 "paste",

 "postage",
@@ -5217,7 +5228,6 @@ dependencies = [ 
 "digest 0.10.7",

 "educe",

 "futures",

 "generic-array",

 "hex",

 "hex-literal",

 "hkdf",

crates/tor-bytes/Cargo.toml

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ repository = "https://gitlab.torproject.org/tpo/core/arti.git/" 
bytes = "1"

digest = { version = "0.10.0", features = ["subtle", "mac"] }

educe = "0.4.6"

generic-array = "0.14.3"

signature = "1"

thiserror = "1"

tor-error = { path = "../tor-error", version = "0.5.4" }

crates/tor-bytes/src/impls.rs

+8 −13
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
//! this is where I'm putting them.



use super::*;

use generic_array::GenericArray;



// ----------------------------------------------------------------------
@@ -47,15 +46,11 @@ impl Writeable for Vec<u8> { 
    }

}



// The GenericArray type is defined to work around a limitation in Rust's

// type system.  Ideally we can get rid of GenericArray entirely at some

// point down the line.

//

// For now, we only use `GenericArray<u8>`, so that's all we'll declare, since

// it permits a faster implementation.

impl<N> Readable for GenericArray<u8, N>

// We also need to implement our traits for an older version (0.14) of

// generic_array, since that's what the digest crate uses (as of digest 0.10.)

impl<N> Readable for digest::generic_array::GenericArray<u8, N>

where

    N: generic_array::ArrayLength<u8>,

    N: digest::generic_array::ArrayLength<u8>,

{

    fn take_from(b: &mut Reader<'_>) -> Result<Self> {

        // safety -- "take" returns the requested bytes or error.
@@ -63,9 +58,9 @@ where 
    }

}



impl<N> Writeable for GenericArray<u8, N>

impl<N> Writeable for digest::generic_array::GenericArray<u8, N>

where

    N: generic_array::ArrayLength<u8>,

    N: digest::generic_array::ArrayLength<u8>,

{

    fn write_onto<B: Writer + ?Sized>(&self, b: &mut B) -> EncodeResult<()> {

        b.write_all(self.as_slice());
@@ -271,7 +266,7 @@ mod digest_impls { 
    }

    impl<T: OutputSizeUser> Readable for CtOutput<T> {

        fn take_from(b: &mut Reader<'_>) -> Result<Self> {

            let array = GenericArray::take_from(b)?;

            let array = digest::generic_array::GenericArray::take_from(b)?;

            Ok(CtOutput::new(array))

        }

    }
@@ -359,7 +354,7 @@ mod tests { 


    #[test]

    fn genarray() {

        use generic_array as ga;

        use digest::generic_array as ga;

        let a: ga::GenericArray<u8, ga::typenum::U7> = [4, 5, 6, 7, 8, 9, 10].into();

        check_roundtrip!(ga::GenericArray<u8, ga::typenum::U7>,

                         a,

crates/tor-dirmgr/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" } 
derive_more = "0.99.3"

digest = "0.10.0"

educe = "0.4.6"

event-listener = "2"

event-listener = "3"

fs-mistrust = { path = "../fs-mistrust", version = "0.7.3" }

fslock = { version = "0.2.0" }

futures = "0.3.14"
@@ -69,7 +69,7 @@ hex = "0.4" 
humantime = "2"

humantime-serde = "1.1.1"

itertools = "0.11.0"

memmap2 = { version = "0.7.0", optional = true }

memmap2 = { version = "0.8.0", optional = true }

once_cell = "1"

paste = "1"

postage = { version = "0.5.0", default-features = false, features = ["futures-traits"] }

crates/tor-dirmgr/src/event.rs

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ pub(crate) struct FlagListener<F> { 
    ///

    /// We must always have one of these available _before_ we check any counts

    /// in self.inner.

    listener: event_listener::EventListener,

    listener: Pin<Box<event_listener::EventListener>>,

    /// Reference to shared data.

    inner: Arc<Inner<F>>,

}