mirror of
https://github.com/fluencelabs/rust-libp2p
synced 2025-05-20 22:51:20 +00:00
Deprecate some functions and minor tweaks
This commit is contained in:
parent
458077417e
commit
c86e91babc
@ -8,6 +8,7 @@ members = [
|
|||||||
"multistream-select",
|
"multistream-select",
|
||||||
"datastore",
|
"datastore",
|
||||||
"futures-mutex",
|
"futures-mutex",
|
||||||
|
"rust-multiaddr",
|
||||||
"rw-stream-sink",
|
"rw-stream-sink",
|
||||||
"circular-buffer",
|
"circular-buffer",
|
||||||
"varint-rs",
|
"varint-rs",
|
||||||
|
@ -69,10 +69,12 @@ impl Multiaddr {
|
|||||||
/// ]);
|
/// ]);
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
|
#[deprecated(note = "Use `string.parse()` instead")]
|
||||||
pub fn new(input: &str) -> Result<Multiaddr> {
|
pub fn new(input: &str) -> Result<Multiaddr> {
|
||||||
let mut bytes = Vec::new();
|
let mut bytes = Vec::new();
|
||||||
|
|
||||||
let mut parts = input.split('/');
|
let mut parts = input.split('/');
|
||||||
|
// A multiaddr must start with `/`
|
||||||
if !parts.next().ok_or(Error::InvalidMultiaddr)?.is_empty() {
|
if !parts.next().ok_or(Error::InvalidMultiaddr)?.is_empty() {
|
||||||
return Err(Error::InvalidMultiaddr);
|
return Err(Error::InvalidMultiaddr);
|
||||||
}
|
}
|
||||||
@ -119,6 +121,7 @@ impl Multiaddr {
|
|||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
#[inline]
|
#[inline]
|
||||||
|
#[deprecated(note = "Use `self.iter().map(|addr| addr.protocol_id())` instead")]
|
||||||
pub fn protocol(&self) -> Vec<ProtocolId> {
|
pub fn protocol(&self) -> Vec<ProtocolId> {
|
||||||
self.iter().map(|addr| addr.protocol_id()).collect()
|
self.iter().map(|addr| addr.protocol_id()).collect()
|
||||||
}
|
}
|
||||||
@ -144,7 +147,7 @@ impl Multiaddr {
|
|||||||
Ok(Multiaddr { bytes: bytes })
|
Ok(Multiaddr { bytes: bytes })
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Remove the outer most address from itself.
|
/// Remove the outermost address.
|
||||||
///
|
///
|
||||||
/// # Examples
|
/// # Examples
|
||||||
///
|
///
|
||||||
@ -252,6 +255,16 @@ impl From<AddrComponent> for Multiaddr {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a> IntoIterator for &'a Multiaddr {
|
||||||
|
type Item = AddrComponent;
|
||||||
|
type IntoIter = Iter<'a>;
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
fn into_iter(self) -> Iter<'a> {
|
||||||
|
Iter(&self.bytes)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl FromIterator<AddrComponent> for Multiaddr {
|
impl FromIterator<AddrComponent> for Multiaddr {
|
||||||
fn from_iter<T>(iter: T) -> Self
|
fn from_iter<T>(iter: T) -> Self
|
||||||
where T: IntoIterator<Item = AddrComponent>
|
where T: IntoIterator<Item = AddrComponent>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user