fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-24 07:11:38 +00:00
Code Issues Projects Releases Wiki Activity

Update to bytes v0.5

Browse Source 
Except for `multiaddr` which encapsulates its use of bytes v0.4 now.
This commit is contained in:
Toralf Wittner
2019-12-21 15:35:55 +01:00
parent 589fdafdda
commit 2bc8d9590d
25 changed files with 72 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
misc/multiaddr/src/lib.rs
View File

@ -7,7 +7,7 @@ mod errors;
mod from_url;
mod util;
use bytes::{Bytes, BytesMut};
use bytes::Bytes;
use serde::{
Deserialize,
Deserializer,
@ -290,10 +290,10 @@ impl From<Ipv6Addr> for Multiaddr {
}
}
impl TryFrom<Bytes> for Multiaddr {
impl TryFrom<Vec<u8>> for Multiaddr {
type Error = Error;
fn try_from(v: Bytes) -> Result<Self> {
fn try_from(v: Vec<u8>) -> Result<Self> {
// Check if the argument is a valid `Multiaddr` by reading its protocols.
let mut slice = &v[..];
while !slice.is_empty() {
@ -304,22 +304,6 @@ impl TryFrom<Bytes> for Multiaddr {
}
}
impl TryFrom<BytesMut> for Multiaddr {
type Error = Error;
fn try_from(v: BytesMut) -> Result<Self> {
Multiaddr::try_from(v.freeze())
}
}
impl TryFrom<Vec<u8>> for Multiaddr {
type Error = Error;
fn try_from(v: Vec<u8>) -> Result<Self> {
Multiaddr::try_from(Bytes::from(v))
}
}
impl TryFrom<String> for Multiaddr {
type Error = Error;