diff --git a/idna/Cargo.toml b/idna/Cargo.toml
index 60024732..8d06c78e 100644
--- a/idna/Cargo.toml
+++ b/idna/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "idna"
-version = "1.0.3"
+version = "1.0.4"
 authors = ["The rust-url developers"]
 description = "IDNA (Internationalizing Domain Names in Applications) and Punycode."
 keywords = ["no_std", "web", "http"]
diff --git a/idna/src/lib.rs b/idna/src/lib.rs
index ef537117..878b243c 100644
--- a/idna/src/lib.rs
+++ b/idna/src/lib.rs
@@ -74,9 +74,6 @@ impl From<Errors> for Result<(), Errors> {
 #[cfg(feature = "std")]
 impl std::error::Error for Errors {}
 
-#[cfg(not(feature = "std"))]
-impl core::error::Error for Errors {}
-
 impl core::fmt::Display for Errors {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         core::fmt::Debug::fmt(self, f)
diff --git a/url/Cargo.toml b/url/Cargo.toml
index 6f5532af..6e88b076 100644
--- a/url/Cargo.toml
+++ b/url/Cargo.toml
@@ -2,7 +2,7 @@
 
 name = "url"
 # When updating version, also modify html_root_url in the lib.rs
-version = "2.5.3"
+version = "2.5.4"
 authors = ["The rust-url developers"]
 
 description = "URL library for Rust, based on the WHATWG URL Standard"
@@ -26,7 +26,7 @@ wasm-bindgen-test = "0.3"
 
 [dependencies]
 form_urlencoded = { version = "1.2.1", path = "../form_urlencoded", default-features = false, features = ["alloc"] }
-idna = { version = "1.0.3", path = "../idna", default-features = false, features = ["alloc", "compiled_data"] }
+idna = { version = "1.0.4", path = "../idna", default-features = false, features = ["alloc", "compiled_data"] }
 percent-encoding = { version = "2.3.1", path = "../percent_encoding", default-features = false, features = ["alloc"] }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 
diff --git a/url/src/lib.rs b/url/src/lib.rs
index bf944741..546b835d 100644
--- a/url/src/lib.rs
+++ b/url/src/lib.rs
@@ -143,7 +143,7 @@ url = { version = "2", features = ["debugger_visualizer"] }
 */
 
 #![no_std]
-#![doc(html_root_url = "https://docs.rs/url/2.5.3")]
+#![doc(html_root_url = "https://docs.rs/url/2.5.4")]
 #![cfg_attr(
     feature = "debugger_visualizer",
     debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis")
@@ -1398,10 +1398,7 @@ impl Url {
     /// ```
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let url = Url::parse("https://example.com/foo/bar")?;
@@ -1868,10 +1865,7 @@ impl Url {
     /// ```
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let mut url = Url::parse("ssh://example.net:2048/")?;
@@ -1891,10 +1885,7 @@ impl Url {
     /// ```rust
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let mut url = Url::parse("https://example.org/")?;
diff --git a/url/src/parser.rs b/url/src/parser.rs
index e26b5028..816aa3a6 100644
--- a/url/src/parser.rs
+++ b/url/src/parser.rs
@@ -76,9 +76,6 @@ macro_rules! simple_enum_error {
 #[cfg(feature = "std")]
 impl std::error::Error for ParseError {}
 
-#[cfg(not(feature = "std"))]
-impl core::error::Error for ParseError {}
-
 simple_enum_error! {
     EmptyHost => "empty host",
     IdnaError => "invalid international domain name",
diff --git a/url/src/path_segments.rs b/url/src/path_segments.rs
index 5cc8e775..9471a33c 100644
--- a/url/src/path_segments.rs
+++ b/url/src/path_segments.rs
@@ -21,10 +21,7 @@ use core::str;
 /// ```rust
 /// use url::Url;
 ///
-/// # #[cfg(feature = "std")]
 /// # use std::error::Error;
-/// # #[cfg(not(feature = "std"))]
-/// # use core::error::Error;
 ///
 /// # fn run() -> Result<(), Box<dyn Error>> {
 /// let mut url = Url::parse("mailto:me@example.com")?;
@@ -84,10 +81,7 @@ impl<'a> PathSegmentsMut<'a> {
     /// ```rust
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let mut url = Url::parse("https://github.com/servo/rust-url/")?;
@@ -116,10 +110,7 @@ impl<'a> PathSegmentsMut<'a> {
     /// ```rust
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let mut url = Url::parse("https://github.com/servo/rust-url/")?;
@@ -195,10 +186,7 @@ impl<'a> PathSegmentsMut<'a> {
     /// ```rust
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let mut url = Url::parse("https://github.com/")?;
@@ -219,10 +207,7 @@ impl<'a> PathSegmentsMut<'a> {
     /// ```rust
     /// use url::Url;
     ///
-    /// # #[cfg(feature = "std")]
     /// # use std::error::Error;
-    /// # #[cfg(not(feature = "std"))]
-    /// # use core::error::Error;
     ///
     /// # fn run() -> Result<(), Box<dyn Error>> {
     /// let mut url = Url::parse("https://github.com/servo")?;