Added unstable, no_std_net options

Author: domenukk

.github/workflows/main.yml

@@ -51,9 +51,9 @@ jobs:
           matrix.rust == 'nightly'
         run: cargo test --test debugger_visualizer --features "url/serde,url/debugger_visualizer" -- --test-threads=1
       - name: Test `no_std` support
-        run: cargo test --no-default-features --features=alloc
+        run: cargo test --no-default-features --features=alloc,no_std_net
       - name: Build `aarch64-unknown-none` with `no_std`
-        run: cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release --no-default-features --features=alloc
+        run: cargo +nightly build -Zbuild-std=core,alloc --target aarch64-unknown-none -v --release --no-default-features --features=alloc,unstable
 
   WASM:
     runs-on: ubuntu-latest

idna/Cargo.toml

@@ -17,6 +17,8 @@ doctest = false
 default = ["std"]
 std = ["alloc", "unicode-bidi/std", "unicode-normalization/std"]
 alloc = []
+# Enable nightly features
+unstable = []
 
 [[test]]
 name = "tests"

idna/src/lib.rs

@@ -32,6 +32,7 @@
 //! > that minimizes the impact of this transition for client software,
 //! > allowing client software to access domains that are valid under either system.
 #![no_std]
+#[cfg_attr(feature = "unstable", feature("error_in_core"))]
 
 // For forwards compatibility
 #[cfg(feature = "std")]

idna/src/uts46.rs

@@ -713,6 +713,9 @@ impl From<Errors> for Result<(), Errors> {
 #[cfg(feature = "std")]
 impl std::error::Error for Errors {}
 
+#[cfg(feature = "nightly")]
+impl core::error::Error for Errors{}
+
 impl fmt::Display for Errors {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt::Debug::fmt(self, f)

url/Cargo.toml

@@ -33,18 +33,22 @@ idna = { version = "0.3.0", path = "../idna", default-features = false, features
 percent-encoding = { version = "2.2.0", path = "../percent_encoding", default-features = false, features = ["alloc"] }
 data-url = { version = "0.2.0", path = "../data-url", default-features = false, features = ["alloc"] }
 serde = {version = "1.0", optional = true, default-features = false, features = ["alloc", "derive"]}
-no-std-net = { version = "0.6.0", default-features = false }
+no-std-net = { version = "0.6.0", default-features = false, optional = true }
 
 [features]
 default = ["std"]
-std = ["idna/std", "percent-encoding/std", "form_urlencoded/std", "no-std-net/std", "alloc"]
+std = ["idna/std", "percent-encoding/std", "form_urlencoded/std", "alloc"]
 alloc = []
 # UNSTABLE FEATURES (requires Rust nightly)
 # Enable to use the #[debugger_visualizer] attribute.
 debugger_visualizer = []
 # Expose internal offsets of the URL.
 expose_internals = []
 serde = ["dep:serde", "no-std-net/serde"]
+# For no_std: Allow the use of no_std_net instead of nightly
+no_std_net = ["no-std-net"]
+# For no_std: Use errors_in_core and net_in_core
+unstable = ["idna/unstable"]
 
 [[bench]]
 name = "parse_url"

url/src/host.rs

@@ -6,6 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use crate::net::{Ipv4Addr, Ipv6Addr};
 use alloc::{
     borrow::ToOwned,
     string::{String, ToString},
@@ -15,7 +16,6 @@ use core::{
     cmp,
     fmt::{self, Formatter},
 };
-use no_std_net::{Ipv4Addr, Ipv6Addr};
 
 use percent_encoding::{percent_decode, utf8_percent_encode, CONTROLS};
 #[cfg(feature = "serde")]

url/src/lib.rs

@@ -121,13 +121,25 @@ url = { version = "2", features = ["serde"] }
 
 */
 
+#![no_std]
 #![doc(html_root_url = "https://docs.rs/url/2.3.1")]
 #![cfg_attr(
     feature = "debugger_visualizer",
     feature(debugger_visualizer),
     debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis")
 )]
-#![no_std]
+#![cfg_attr(
+    all(
+        not(feature = "std"),
+        not(feature = "no_std_net"),
+        feature = "unstable"
+    ),
+    feature(ip_in_core)
+)]
+#![cfg_attr(
+    all(not(feature = "std"), feature = "unstable"),
+    feature(error_in_core)
+)]
 
 pub use form_urlencoded;
 
@@ -141,10 +153,16 @@ extern crate alloc;
 #[cfg(not(feature = "alloc"))]
 compile_error!("the `alloc` feature must be enabled");
 
+#[cfg(not(any(feature = "no_std_net", feature = "std", feature = "unstable")))]
+compile_error!(
+    "Either the `no_std_net`, `std` or, on nightly, the `unstable` feature, must be enabled"
+);
+
 #[cfg(feature = "serde")]
 extern crate serde;
 
 use crate::host::HostInternal;
+use crate::net::IpAddr;
 use crate::parser::{to_u32, Context, Parser, SchemeType, USERINFO};
 use alloc::borrow::ToOwned;
 use alloc::string::{String, ToString};
@@ -156,9 +174,24 @@ use core::hash;
 use core::mem;
 use core::ops::{Range, RangeFrom, RangeTo};
 use core::str;
-use no_std_net::IpAddr;
 use percent_encoding::utf8_percent_encode;
 
+/// `std` version of `net`
+#[cfg(feature = "std")]
+pub(crate) mod net {
+    pub use std::net::*;
+}
+/// `no_std` non-nightly of `net`
+#[cfg(all(not(feature = "std"), feature = "no_std_net"))]
+pub(crate) mod net {
+    pub use no_std_net::*;
+}
+/// `no_std` nightly version of `net`
+#[cfg(all(not(feature = "std"), not(feature = "no_std_net")))]
+pub(crate) mod net {
+    pub use core::net::*;
+}
+
 #[cfg(feature = "std")]
 use std::{
     io,

url/src/parser.rs

@@ -75,6 +75,9 @@ macro_rules! simple_enum_error {
 #[cfg(feature = "std")]
 impl std::error::Error for ParseError {}
 
+#[cfg(feature = "unstable")]
+impl core::error::Error for ParseError {}
+
 simple_enum_error! {
     EmptyHost => "empty host",
     IdnaError => "invalid international domain name",

url/tests/unit.rs

@@ -7,17 +7,64 @@
 // except according to those terms.
 
 //! Unit tests
+#![no_std]
+#![cfg_attr(
+    all(
+        not(feature = "std"),
+        not(feature = "no_std_net"),
+        feature = "unstable"
+    ),
+    feature(ip_in_core)
+)]
+#![cfg_attr(
+    all(not(feature = "std"), feature = "unstable"),
+    feature(error_in_core)
+)]
 
+#[cfg(feature = "std")]
+extern crate std;
+
+#[macro_use]
+extern crate alloc;
+
+#[cfg(not(feature = "alloc"))]
+compile_error!("the `alloc` feature must be enabled");
+
+#[cfg(not(any(feature = "no_std_net", feature = "std", feature = "unstable")))]
+compile_error!(
+    "Either the `no_std_net`, `std` or, on nightly, the `unstable` feature, must be enabled"
+);
+
+use alloc::borrow::Cow;
+use alloc::borrow::ToOwned;
+use alloc::string::{String, ToString};
+use alloc::vec::Vec;
 use core::cell::{Cell, RefCell};
-use no_std_net::{Ipv4Addr, Ipv6Addr};
-use std::borrow::Cow;
 #[cfg(feature = "std")]
 use std::path::{Path, PathBuf};
 use url::{form_urlencoded, Host, Origin, Url};
 
+/// `std` version of `net`
+#[cfg(feature = "std")]
+pub(crate) mod net {
+    pub use std::net::*;
+}
+/// `no_std` non-nightly of `net`
+#[cfg(all(not(feature = "std"), feature = "no_std_net"))]
+pub(crate) mod net {
+    pub use no_std_net::*;
+}
+/// `no_std` nightly version of `net`
+#[cfg(all(not(feature = "std"), not(feature = "no_std_net")))]
+pub(crate) mod net {
+    pub use core::net::*;
+}
+
+use crate::net::{Ipv4Addr, Ipv6Addr};
+
 #[test]
 fn size() {
-    use std::mem::size_of;
+    use core::mem::size_of;
     assert_eq!(size_of::<Url>(), size_of::<Option<Url>>());
 }
 
@@ -262,6 +309,7 @@ fn issue_124() {
 }
 
 #[test]
+#[cfg(feature = "std")]
 fn test_equality() {
     use std::collections::hash_map::DefaultHasher;
     use std::hash::{Hash, Hasher};
@@ -542,6 +590,7 @@ fn test_leading_dots() {
 }
 
 #[test]
+#[cfg(feature = "std")]
 /// https://github.com/servo/rust-url/issues/302
 fn test_origin_hash() {
     use std::collections::hash_map::DefaultHasher;