Commit 429d2c7c authored by Ian Jackson's avatar Ian Jackson
Browse files

bridge config: Rename accessors 

As per
  tpo/core/arti!904 (comment 2858480)
parent 117bee58

crates/tor-guardmgr/src/bridge/config.rs

+2 −2
Original line number Diff line number Diff line
@@ -238,9 +238,9 @@ impl BridgeConfigBuilder { 
                }

                let addrs = addrs.iter().filter_map(|ba| {

                    #[allow(clippy::redundant_pattern_matching)] // for consistency

                    if let Some(sa) = ba.addr_as_sockaddr() {

                    if let Some(sa) = ba.as_socketaddr() {

                        Some(Ok(*sa))

                    } else if let Some(_) = ba.named_as_host_port() {

                    } else if let Some(_) = ba.as_host_port() {

                        Some(Err(

                            "`addrs` contains hostname and port, but only numeric addresses are supported for a direct bridge connection",

                        ))

crates/tor-linkspec/src/transport.rs

+2 −2
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ impl BridgeAddr { 
    }



    /// If this is a numeric address, return it as a `SocketAddr`

    pub fn addr_as_sockaddr(&self) -> Option<&SocketAddr> {

    pub fn as_socketaddr(&self) -> Option<&SocketAddr> {

        match &self.0 {

            BridgeAddrInner::IpPort(sa) => Some(sa),

            BridgeAddrInner::HostPort(..) => None,
@@ -305,7 +305,7 @@ impl BridgeAddr { 
    }



    /// If this is a named host and port, return it as hostname string and port

    pub fn named_as_host_port(&self) -> Option<(&str, u16)> {

    pub fn as_host_port(&self) -> Option<(&str, u16)> {

        match &self.0 {

            BridgeAddrInner::IpPort(..) => None,

            BridgeAddrInner::HostPort(hn, port) => Some((hn, *port)),