Remove no-std-net

Author: domenukk

idna/Cargo.toml

@@ -17,8 +17,6 @@ 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,7 +32,6 @@
 //! > 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")]
 extern crate std;

idna/src/uts46.rs

@@ -714,7 +714,7 @@ impl From<Errors> for Result<(), Errors> {
 #[cfg(feature = "std")]
 impl std::error::Error for Errors {}
 
-#[cfg(feature = "unstable")]
+#[cfg(not(feature = "std"))]
 impl core::error::Error for Errors {}
 
 impl fmt::Display for Errors {

url/Cargo.toml

@@ -29,7 +29,6 @@ form_urlencoded = { version = "1.2.1", path = "../form_urlencoded", default-feat
 idna = { version = "0.5.0", path = "../idna", default-features = false, features = ["alloc"] }
 percent-encoding = { version = "2.3.1", path = "../percent_encoding", default-features = false, features = ["alloc"] }
 serde = {version = "1.0", optional = true, features = ["derive"]}
-no-std-net = { version = "0.6.0", default-features = false, optional = true }
 
 [features]
 default = ["std"]
@@ -40,11 +39,6 @@ alloc = ["form_urlencoded/alloc", "idna/alloc", "percent-encoding/alloc"]
 debugger_visualizer = []
 # Expose internal offsets of the URL.
 expose_internals = []
-# For no_std: Allow the use of no_std_net instead of nightly
-no_std_net = ["no-std-net"]
-# UNSTABLE FEATURES (requires Rust nightly)
-# For no_std: Use errors_in_core and net_in_core
-unstable = ["idna/unstable"]
 
 [[test]]
 name = "url_wpt"

url/src/lib.rs

@@ -185,21 +185,16 @@ use alloc::str;
 use alloc::string::{String, ToString};
 use alloc::borrow::ToOwned;
 #[cfg(feature = "std")]
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use core::convert::TryFrom;
 
 /// `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")))]
+#[cfg(not(feature = "std"))]
 pub(crate) mod net {
     pub use core::net::*;
 }
@@ -2717,7 +2712,7 @@ impl Url {
         any(unix, windows, target_os = "redox", target_os = "wasi")
     ))]
     #[allow(clippy::result_unit_err)]
-    pub fn to_file_path(&self) -> Result<std::path::PathBuf, ()> {
+    pub fn to_file_path(&self) -> Result<PathBuf, ()> {
         if let Some(segments) = self.path_segments() {
             let host = match self.host() {
                 None | Some(Host::Domain("localhost")) => None,
@@ -2921,7 +2916,7 @@ impl<'de> serde::Deserialize<'de> for Url {
 
 #[cfg(all(feature = "std", any(unix, target_os = "redox", target_os = "wasi")))]
 fn path_to_file_url_segments(
-    path: &std::path::Path,
+    path: &Path,
     serialization: &mut String,
 ) -> Result<(u32, HostInternal), ()> {
     use parser::SPECIAL_PATH_SEGMENT;
@@ -2953,7 +2948,7 @@ fn path_to_file_url_segments(
 
 #[cfg(all(feature = "std", windows))]
 fn path_to_file_url_segments(
-    path: &std::path::Path,
+    path: &Path,
     serialization: &mut String,
 ) -> Result<(u32, HostInternal), ()> {
     path_to_file_url_segments_windows(path, serialization)
@@ -2964,7 +2959,7 @@ fn path_to_file_url_segments(
 #[cfg_attr(not(windows), allow(dead_code))]
 #[cfg(feature = "std")]
 fn path_to_file_url_segments_windows(
-    path: &std::path::Path,
+    path: &Path,
     serialization: &mut String,
 ) -> Result<(u32, HostInternal), ()> {
     use crate::parser::PATH_SEGMENT;
@@ -3079,14 +3074,13 @@ fn file_url_segments_to_pathbuf(
 fn file_url_segments_to_pathbuf(
     host: Option<&str>,
     segments: str::Split<char>,
-) -> Result<std::path::PathBuf, ()> {
+) -> Result<PathBuf, ()> {
     file_url_segments_to_pathbuf_windows(host, segments)
 }
 
-#[cfg(feature = "std")]
 // Build this unconditionally to alleviate https://github.com/servo/rust-url/issues/102
-#[cfg_attr(not(windows), allow(dead_code))]
 #[cfg(feature = "std")]
+#[cfg_attr(not(windows), allow(dead_code))]
 fn file_url_segments_to_pathbuf_windows(
     host: Option<&str>,
     mut segments: str::Split<'_, char>,
@@ -3131,7 +3125,7 @@ fn file_url_segments_to_pathbuf_windows(
             Err(..) => return Err(()),
         }
     }
-    let path = std::path::PathBuf::from(string);
+    let path = PathBuf::from(string);
     debug_assert!(
         path.is_absolute(),
         "to_file_path() failed to produce an absolute Path"

url/src/parser.rs

@@ -76,7 +76,7 @@ macro_rules! simple_enum_error {
 #[cfg(feature = "std")]
 impl std::error::Error for ParseError {}
 
-#[cfg(feature = "unstable")]
+#[cfg(not(feature = "std"))]
 impl core::error::Error for ParseError {}
 
 simple_enum_error! {

url/tests/unit.rs

@@ -8,18 +8,6 @@
 
 //! 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;
@@ -30,44 +18,22 @@ extern crate alloc;
 #[cfg(not(feature = "alloc"))]
 compile_error!("the `alloc` feature must be enabled");
 
-#[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};
 #[cfg(feature = "std")]
-use std::{
-    dbg,
-    path::{Path, PathBuf},
-};
+use std::dbg;
 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")))]
+#[cfg(not(feature = "std"))]
 pub(crate) mod net {
     pub use core::net::*;
 }