Merge in wasm-tests changes

Author: micolous

url/src/host.rs

@@ -139,14 +139,14 @@ impl Host<String> {
         }
     }
 
-    #[cfg(not(target_arch="wasm32"))]
-    /// convert domain with idna
+    #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
+    /// Convert IDN domain to ASCII form with [idna]
     fn domain_to_ascii(domain: &str) -> Result<String, ParseError> {
         idna::domain_to_ascii(domain).map_err(Into::into)
     }
 
-    #[cfg(target_arch="wasm32")]
-    /// convert domain with idna
+    #[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
+    /// Convert IDN domain to ASCII form with [web_sys::Url]
     fn domain_to_ascii(domain: &str) -> Result<String, ParseError> {
         // Url throws an error on empty hostnames
         if domain.is_empty() {
@@ -156,9 +156,8 @@ impl Host<String> {
         if domain.contains(Self::is_invalid_domain_char) {
             return Err(ParseError::InvalidDomainCharacter);
         }
-        let u = web_sys::Url::new(&format!("http://{domain}")).map_err(|_| {
-            ParseError::IdnaError
-        })?;
+        let u =
+            web_sys::Url::new(&format!("http://{domain}")).map_err(|_| ParseError::IdnaError)?;
         Ok(u.host())
     }
 

url/src/origin.rs

@@ -85,9 +85,15 @@ impl Origin {
         }
     }
 
-    #[cfg(not(target_arch = "wasm32"))]
-    // FIXME: "There used to also be a Unicode serialization of an origin. However, it was never widely adopted."
-    /// <https://html.spec.whatwg.org/multipage/#unicode-serialisation-of-an-origin>
+    #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
+    #[deprecated]
+    /// [The Unicode serialization of an origin][0].
+    ///
+    /// This [has been removed from the standard][1] because it was never widely
+    /// adopted, and was difficult to use.
+    ///
+    /// [0]: https://html.spec.whatwg.org/multipage/#unicode-serialisation-of-an-origin
+    /// [1]: https://github.com/whatwg/html/pull/2689
     pub fn unicode_serialization(&self) -> String {
         match *self {
             Origin::Opaque(_) => "null".to_owned(),

url/src/parser.rs

@@ -87,7 +87,7 @@ simple_enum_error! {
     Overflow => "URLs more than 4 GB are not supported",
 }
 
-#[cfg(not(target_arch = "wasm32"))]
+#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
 impl From<::idna::Errors> for ParseError {
     fn from(_: ::idna::Errors) -> ParseError {
         ParseError::IdnaError

url/src/quirks.rs

@@ -65,8 +65,10 @@ pub fn domain_to_ascii(domain: &str) -> String {
     }
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-/// https://url.spec.whatwg.org/#dom-url-domaintounicode
+#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
+/// <https://url.spec.whatwg.org/#dom-url-domaintounicode>
+///
+/// This feature is not available on `wasm32-unknown-unknown` targets.
 pub fn domain_to_unicode(domain: &str) -> String {
     match Host::parse(domain) {
         Ok(Host::Domain(ref domain)) => {

url/tests/unit.rs

@@ -773,7 +773,7 @@ fn test_set_href() {
 #[test]
 fn test_domain_encoding_quirks() {
     use url::quirks::domain_to_ascii;
-    #[cfg(not(target_arch = "wasm32"))]
+    #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
     use url::quirks::domain_to_unicode;
 
     let data = [
@@ -785,7 +785,7 @@ fn test_domain_encoding_quirks() {
 
     for url in &data {
         assert_eq!(domain_to_ascii(url.0), url.1);
-        #[cfg(not(target_arch = "wasm32"))]
+        #[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
         assert_eq!(domain_to_unicode(url.0), url.2);
     }
 }