Stop supporting no_alloc

Author: yescallop

.github/workflows/ci.yml

@@ -20,8 +20,6 @@ jobs:
         run: cargo test --all-features
       - name: Test with no features
         run: cargo test --tests --no-default-features
-      - name: Test with feature alloc
-        run: cargo test --tests --no-default-features -F alloc
       - name: Test with feature impl-error
         run: cargo test --tests --no-default-features -F impl-error
       - name: Test with feature net

Cargo.toml

@@ -13,18 +13,18 @@ categories = ["encoding", "parser-implementations"]
 
 [features]
 default = ["std"]
-std = ["alloc", "impl-error"]
-alloc = ["borrow-or-share/alloc", "serde?/alloc"]
+std = ["impl-error"]
 impl-error = []
 net = []
 
 [dependencies]
-borrow-or-share = { version = "0.2.4", default-features = false }
+borrow-or-share = "0.2"
 ref-cast = "1.0"
 
 [dependencies.serde]
 version = "1.0"
 default-features = false
+features = ["alloc"]
 optional = true
 
 [package.metadata.docs.rs]

src/component.rs

@@ -227,7 +227,6 @@ impl<'a, UserinfoE: Encoder, RegNameE: Encoder> Authority<'a, UserinfoE, RegName
     /// An empty authority component.
     pub const EMPTY: Authority<'static, UserinfoE, RegNameE> = Authority::new("", AuthMeta::EMPTY);
 
-    #[cfg(feature = "alloc")]
     pub(crate) fn meta(&self) -> AuthMeta {
         self.inner.meta
     }

src/convert.rs

@@ -1,16 +1,10 @@
-use crate::{imp::RiMaybeRef, Iri, IriRef, Uri, UriRef};
-use borrow_or_share::Bos;
-use core::str;
-
-#[cfg(feature = "alloc")]
 use crate::{
-    imp::{HostMeta, Meta, RmrRef},
-    pct_enc,
+    imp::{HostMeta, Meta, RiMaybeRef, RmrRef},
+    pct_enc, Iri, IriRef, Uri, UriRef,
 };
-#[cfg(feature = "alloc")]
 use alloc::string::String;
-#[cfg(feature = "alloc")]
-use core::num::NonZeroUsize;
+use borrow_or_share::Bos;
+use core::{num::NonZeroUsize, str};
 
 macro_rules! impl_from {
     ($($x:ident => $($y:ident),+)*) => {
@@ -60,7 +54,6 @@ macro_rules! impl_try_from {
                 }
             }
 
-            #[cfg(feature = "alloc")]
             impl TryFrom<$x<String>> for $y<String> {
                 type Error = (ConvertError, $x<String>);
 
@@ -92,7 +85,6 @@ impl_try_from! {
     IriRef if ensure_has_scheme => Iri
 }
 
-#[cfg(feature = "alloc")]
 impl<T: Bos<str>> Iri<T> {
     /// Converts the IRI to a URI by percent-encoding non-ASCII characters.
     ///
@@ -114,7 +106,6 @@ impl<T: Bos<str>> Iri<T> {
     }
 }
 
-#[cfg(feature = "alloc")]
 impl<T: Bos<str>> IriRef<T> {
     /// Converts the IRI reference to a URI reference by percent-encoding non-ASCII characters.
     ///
@@ -136,7 +127,6 @@ impl<T: Bos<str>> IriRef<T> {
     }
 }
 
-#[cfg(feature = "alloc")]
 fn encode_non_ascii(r: RmrRef<'_, '_>) -> (String, Meta) {
     let len = r
         .as_str()
@@ -196,7 +186,6 @@ fn encode_non_ascii(r: RmrRef<'_, '_>) -> (String, Meta) {
     (buf, meta)
 }
 
-#[cfg(feature = "alloc")]
 fn encode_non_ascii_str(buf: &mut String, s: &str) {
     if s.is_ascii() {
         buf.push_str(s);

src/imp.rs

@@ -1,27 +1,26 @@
 #![allow(missing_debug_implementations)]
 
-use crate::{
-    component::{Authority, IAuthority, Scheme},
-    convert::ConvertError,
-    parse::{self, ParseError},
-    pct_enc::{encoder::*, EStr, Encoder},
-};
-use borrow_or_share::{BorrowOrShare, Bos};
-use core::{borrow::Borrow, cmp::Ordering, fmt, hash, num::NonZeroUsize, str};
-
-#[cfg(feature = "alloc")]
 use crate::{
     build::{
         state::{NonRefStart, Start},
         Builder,
     },
+    component::{Authority, IAuthority, Scheme},
+    convert::ConvertError,
     normalize::Normalizer,
+    parse::{self, ParseError},
+    pct_enc::{encoder::*, EStr, Encoder},
     resolve::{self, ResolveError},
 };
-#[cfg(feature = "alloc")]
 use alloc::{borrow::ToOwned, string::String};
-#[cfg(feature = "alloc")]
-use core::str::FromStr;
+use borrow_or_share::{BorrowOrShare, Bos};
+use core::{
+    borrow::Borrow,
+    cmp::Ordering,
+    fmt, hash,
+    num::NonZeroUsize,
+    str::{self, FromStr},
+};
 
 #[cfg(feature = "net")]
 use crate::net::{Ipv4Addr, Ipv6Addr};
@@ -33,7 +32,6 @@ pub trait Value: Default {}
 
 impl Value for &str {}
 
-#[cfg(feature = "alloc")]
 impl Value for String {}
 
 pub struct Constraints {
@@ -64,7 +62,6 @@ pub trait RiMaybeRef: Sized {
         Self::Val: BorrowOrShare<'i, 'o, str>;
 }
 
-#[cfg(feature = "alloc")]
 pub trait Ri: RiMaybeRef {
     type Ref<T>: RiMaybeRef<Val = T>;
 }
@@ -85,7 +82,6 @@ impl<'a> Parse for &'a str {
     }
 }
 
-#[cfg(feature = "alloc")]
 impl Parse for String {
     type Val = Self;
     type Err = (ParseError, Self);
@@ -296,7 +292,6 @@ macro_rules! ri_maybe_ref {
         }
 
         $(
-            #[cfg(feature = "alloc")]
             impl<T: Bos<str>> Ri for $Ty<T> {
                 type Ref<U> = $RefTy<U>;
             }
@@ -324,7 +319,6 @@ macro_rules! ri_maybe_ref {
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl $Ty<String> {
             #[doc = concat!("Creates a new builder for ", $name, ".")]
             #[inline]
@@ -351,7 +345,6 @@ macro_rules! ri_maybe_ref {
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl $Ty<&str> {
             #[doc = concat!("Creates a new `", $ty, "<String>` by cloning the contents of this `", $ty, "<&str>`.")]
             #[inline]
@@ -593,7 +586,6 @@ macro_rules! ri_maybe_ref {
                 #[doc = concat!("assert_eq!(", $var, ".resolve_against(&base).unwrap(), \"http://example.com/foo/bar?baz\");")]
                 /// # Ok::<_, fluent_uri::ParseError>(())
                 /// ```
-                #[cfg(feature = "alloc")]
                 pub fn resolve_against<U: Bos<str>>(
                     &self,
                     base: &$NonRefTy<U>,
@@ -639,7 +631,6 @@ macro_rules! ri_maybe_ref {
             #[doc = concat!("assert_eq!(", $var, ".normalize(), \"example://a/b/c/%7Bfoo%7D\");")]
             /// # Ok::<_, fluent_uri::ParseError>(())
             /// ```
-            #[cfg(feature = "alloc")]
             #[must_use]
             pub fn normalize(&self) -> $Ty<String> {
                 Normalizer::new().normalize(self).unwrap()
@@ -749,15 +740,13 @@ macro_rules! ri_maybe_ref {
             #[doc = concat!("assert_eq!(", $var, ".with_fragment(None), \"http://example.com/\");")]
             /// # Ok::<_, fluent_uri::ParseError>(())
             /// ```
-            #[cfg(feature = "alloc")]
             #[must_use]
             pub fn with_fragment(&self, opt: Option<&EStr<$FragmentE>>) -> $Ty<String> {
                 // Altering only the fragment does not change the metadata.
                 RiMaybeRef::new(self.make_ref().with_fragment(opt.map(EStr::as_str)), self.meta)
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl $Ty<String> {
             /// Replaces the fragment component of `self` with the given one.
             ///
@@ -865,7 +854,6 @@ macro_rules! ri_maybe_ref {
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl TryFrom<String> for $Ty<String> {
             type Error = (ParseError, String);
 
@@ -884,7 +872,6 @@ macro_rules! ri_maybe_ref {
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl<'a> From<$Ty<String>> for String {
             #[doc = concat!("Equivalent to [`into_string`](", $ty, "::into_string).")]
             #[inline]
@@ -893,7 +880,6 @@ macro_rules! ri_maybe_ref {
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl From<$Ty<&str>> for $Ty<String> {
             /// Equivalent to [`to_owned`](Self::to_owned).
             #[inline]
@@ -902,7 +888,6 @@ macro_rules! ri_maybe_ref {
             }
         }
 
-        #[cfg(feature = "alloc")]
         impl FromStr for $Ty<String> {
             type Err = ParseError;
 
@@ -1043,7 +1028,6 @@ impl<'v, 'm> RmrRef<'v, 'm> {
             .map(|i| self.eslice(i, self.val.len()))
     }
 
-    #[cfg(feature = "alloc")]
     pub fn set_fragment(buf: &mut String, meta: &Meta, opt: Option<&str>) {
         buf.truncate(meta.query_or_path_end());
         if let Some(s) = opt {
@@ -1057,7 +1041,6 @@ impl<'v, 'm> RmrRef<'v, 'm> {
         &self.val[..self.meta.query_or_path_end()]
     }
 
-    #[cfg(feature = "alloc")]
     pub fn with_fragment(self, opt: Option<&str>) -> String {
         let stripped = self.strip_fragment();
         if let Some(s) = opt {

src/lib.rs

@@ -83,17 +83,14 @@
 //! [`Serialize`]: serde::Serialize
 //! [`Deserialize`]: serde::Deserialize
 
-#[cfg(feature = "alloc")]
 pub mod build;
 pub mod component;
 mod convert;
 mod fmt;
 mod imp;
-#[cfg(feature = "alloc")]
 pub mod normalize;
 mod parse;
 pub mod pct_enc;
-#[cfg(feature = "alloc")]
 pub mod resolve;
 mod utf8;
 
@@ -104,7 +101,6 @@ pub use parse::{ParseError, ParseErrorKind};
 #[cfg(feature = "std")]
 extern crate std;
 
-#[cfg(feature = "alloc")]
 extern crate alloc;
 
 #[cfg(all(feature = "net", not(feature = "std")))]

src/parse.rs

@@ -423,7 +423,7 @@ pub(crate) fn parse_v4_or_reg_name(bytes: &[u8]) -> HostMeta {
     }
 }
 
-#[cfg(all(feature = "alloc", not(feature = "net")))]
+#[cfg(not(feature = "net"))]
 pub(crate) fn parse_v6(bytes: &[u8]) -> [u16; 8] {
     Reader::new(bytes).read_v6().unwrap()
 }