Преглед изворни кода

Remove Url::ip_address for now

Reconsider when IpAddr is stable.
Simon Sapin пре 10 година
родитељ
комит
21db81f0fb
4 измењених фајлова са 2 додато и 35 уклоњено
  1. 0 1
      Cargo.toml
  2. 0 17
      build.rs
  3. 1 0
      src/host.rs
  4. 1 17
      src/lib.rs

+ 0 - 1
Cargo.toml

@@ -10,7 +10,6 @@ repository = "https://github.com/servo/rust-url"
 readme = "README.md"
 keywords = ["url", "parser"]
 license = "MIT/Apache-2.0"
-build = "build.rs"
 
 [[test]]
 name = "form_urlencoded"

+ 0 - 17
build.rs

@@ -1,17 +0,0 @@
-use std::process::{Command, Stdio};
-use std::io::Write;
-
-fn main() {
-    let mut child = Command::new(option_env!("RUSTC").unwrap_or("rustc"))
-        .args(&["-", "--crate-type", "lib", "-Z", "no-trans"])
-        .stdin(Stdio::piped())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .spawn()
-        .unwrap();
-    child.stdin.as_mut().unwrap().write_all(b"use std::net::IpAddr;").unwrap();
-    if child.wait().unwrap().success() {
-        // We can use `IpAddr` as it is `#[stable]` in this version of Rust.
-        println!("cargo:rustc-cfg=has_ipaddr")
-    }
-}

+ 1 - 0
src/host.rs

@@ -120,6 +120,7 @@ impl<S: AsRef<str>> ToSocketAddrs for HostAndPort<S> {
         let port = self.port;
         match self.host {
             Host::Domain(ref domain) => Ok(SocketAddrs {
+                // FIXME: use std::net::lookup_host when it’s stable.
                 state: SocketAddrsState::Domain(try!((domain.as_ref(), port).to_socket_addrs()))
             }),
             Host::Ipv4(address) => Ok(SocketAddrs {

+ 1 - 17
src/lib.rs

@@ -145,7 +145,6 @@ pub use webidl::WebIdl;
 
 mod encoding;
 mod host;
-mod idna_mapping;
 mod origin;
 mod parser;
 mod slicing;
@@ -278,23 +277,8 @@ impl Url {
     /// If this URL has a host and it is a domain name (not an IP address), return it.
     pub fn domain(&self) -> Option<&str> {
         match self.host {
-            HostInternal::None => None,
             HostInternal::Domain => Some(self.slice(self.host_start..self.host_end)),
-            HostInternal::Ipv4(_) => None,
-            HostInternal::Ipv6(_) => None,
-        }
-    }
-
-    /// If this URL has a host and it is an IP address (not a domain name), return it.
-    ///
-    /// This does **not** resolve domain names.
-    #[cfg(has_ipaddr)]
-    pub fn ip_address(&self) -> Option<net::IpAddr> {
-        match self.host {
-            HostInternal::None => None,
-            HostInternal::Domain => None,
-            HostInternal::Ipv4(address) => Some(net::IpAddr::V4(address)),
-            HostInternal::Ipv6(address) => Some(net::IpAddr::V6(address)),
+            _ => None,
         }
     }