rename SmallVec to CowVec

denoland · Dec 19, 2024 · f757dec · f757dec
1 parent 121a557
commit f757dec
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 26 deletions.
diff --git a/src/jsr.rs b/src/jsr.rs
@@ -18,7 +18,6 @@ use crate::package::PackageReq;
 use crate::package::PackageReqParseError;
 use crate::package::PackageReqReference;
 use crate::package::PackageReqReferenceParseError;
-use crate::StackString;
 
 /// A reference to a JSR package's name, version constraint, and potential sub path.
 /// This contains all the information found in an npm specifier.
@@ -270,7 +269,7 @@ impl JsrDepPackageReq {
   /// Outputs a normalized string representation of this dependency.
   ///
   /// Note: The normalized string is not safe for a URL. It's best used for serialization.
-  pub fn to_string_normalized(&self) -> StackString {
+  pub fn to_string_normalized(&self) -> crate::StackString {
     capacity_builder::StringBuilder::build(|builder| {
       builder.append(self.kind.scheme_with_colon());
       builder.append(&self.req.name);

diff --git a/src/lib.rs b/src/lib.rs
@@ -25,7 +25,7 @@ mod specifier;
 mod string;
 
 /// A smaller two-byte vector.
-pub type SmallVec<T> = ecow::EcoVec<T>;
+pub type CowVec<T> = ecow::EcoVec<T>;
 pub use string::SmallStackString;
 pub use string::StackString;
 
@@ -58,8 +58,8 @@ pub struct Version {
   pub major: u64,
   pub minor: u64,
   pub patch: u64,
-  pub pre: SmallVec<VersionPreOrBuild>,
-  pub build: SmallVec<VersionPreOrBuild>,
+  pub pre: CowVec<VersionPreOrBuild>,
+  pub build: CowVec<VersionPreOrBuild>,
 }
 
 impl<'a> StringAppendable<'a> for &'a Version {

diff --git a/src/npm.rs b/src/npm.rs
@@ -21,7 +21,7 @@ use crate::package::PackageReq;
 use crate::package::PackageReqReference;
 use crate::package::PackageReqReferenceParseError;
 use crate::PackageTag;
-use crate::SmallVec;
+use crate::CowVec;
 use crate::VersionPreOrBuild;
 
 use super::Partial;
@@ -138,7 +138,7 @@ fn inner(input: &str) -> ParseResult<RangeSetOrTag> {
   if input.is_empty() {
     return Ok((
       input,
-      RangeSetOrTag::RangeSet(VersionRangeSet(SmallVec::from([
+      RangeSetOrTag::RangeSet(VersionRangeSet(CowVec::from([
         VersionRange::all(),
       ]))),
     ));
@@ -169,7 +169,7 @@ fn inner(input: &str) -> ParseResult<RangeSetOrTag> {
   let ranges = ranges
     .into_iter()
     .filter_map(|r| r.into_range())
-    .collect::<SmallVec<_>>();
+    .collect::<CowVec<_>>();
   Ok((input, RangeSetOrTag::RangeSet(VersionRangeSet(ranges))))
 }
 
@@ -445,8 +445,8 @@ fn nr(input: &str) -> ParseResult<u64> {
 
 #[derive(Debug, Clone, Default)]
 struct Qualifier {
-  pre: SmallVec<VersionPreOrBuild>,
-  build: SmallVec<VersionPreOrBuild>,
+  pre: CowVec<VersionPreOrBuild>,
+  build: CowVec<VersionPreOrBuild>,
 }
 
 // qualifier ::= ( '-' pre )? ( '+' build )?
@@ -463,23 +463,23 @@ fn qualifier(input: &str) -> ParseResult<Qualifier> {
 }
 
 // pre ::= parts
-fn pre(input: &str) -> ParseResult<SmallVec<VersionPreOrBuild>> {
+fn pre(input: &str) -> ParseResult<CowVec<VersionPreOrBuild>> {
   preceded(maybe(ch('-')), parts)(input)
 }
 
 // build ::= parts
-fn build(input: &str) -> ParseResult<SmallVec<VersionPreOrBuild>> {
+fn build(input: &str) -> ParseResult<CowVec<VersionPreOrBuild>> {
   preceded(ch('+'), parts)(input)
 }
 
 // parts ::= part ( '.' part ) *
-fn parts(input: &str) -> ParseResult<SmallVec<VersionPreOrBuild>> {
+fn parts(input: &str) -> ParseResult<CowVec<VersionPreOrBuild>> {
   if_true(
     map(separated_list(part, ch('.')), |text| {
       text
         .into_iter()
         .map(VersionPreOrBuild::from_str)
-        .collect::<SmallVec<_>>()
+        .collect::<CowVec<_>>()
     }),
     |items| !items.is_empty(),
   )(input)

diff --git a/src/range.rs b/src/range.rs
@@ -9,7 +9,7 @@ use capacity_builder::StringType;
 use serde::Deserialize;
 use serde::Serialize;
 
-use crate::SmallVec;
+use crate::CowVec;
 use crate::VersionPreOrBuild;
 
 use super::Version;
@@ -18,7 +18,7 @@ use super::Version;
 #[derive(
   Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, CapacityDisplay,
 )]
-pub struct VersionRangeSet(pub SmallVec<VersionRange>);
+pub struct VersionRangeSet(pub CowVec<VersionRange>);
 
 impl VersionRangeSet {
   pub fn satisfies(&self, version: &Version) -> bool {
@@ -511,8 +511,8 @@ pub struct Partial {
   pub major: XRange,
   pub minor: XRange,
   pub patch: XRange,
-  pub pre: SmallVec<VersionPreOrBuild>,
-  pub build: SmallVec<VersionPreOrBuild>,
+  pub pre: CowVec<VersionPreOrBuild>,
+  pub build: CowVec<VersionPreOrBuild>,
 }
 
 impl Partial {

diff --git a/src/specifier.rs b/src/specifier.rs
@@ -9,7 +9,7 @@ use crate::range::VersionRangeSet;
 use crate::range::XRange;
 use crate::PackageTag;
 use crate::RangeSetOrTag;
-use crate::SmallVec;
+use crate::CowVec;
 use crate::VersionPreOrBuild;
 use crate::VersionReq;
 
@@ -39,7 +39,7 @@ pub fn parse_version_req_from_specifier(
           crate::SmallStackString::from_str(input),
           match range_result {
             Ok(range) => {
-              RangeSetOrTag::RangeSet(VersionRangeSet(SmallVec::from([range])))
+              RangeSetOrTag::RangeSet(VersionRangeSet(CowVec::from([range])))
             }
             Err(err) => {
               if is_valid_tag(input) {
@@ -136,8 +136,8 @@ fn nr(input: &str) -> ParseResult<u64> {
 
 #[derive(Debug, Clone, Default)]
 struct Qualifier {
-  pre: SmallVec<VersionPreOrBuild>,
-  build: SmallVec<VersionPreOrBuild>,
+  pre: CowVec<VersionPreOrBuild>,
+  build: CowVec<VersionPreOrBuild>,
 }
 
 // qualifier ::= ( '-' pre )? ( '+' build )?
@@ -154,23 +154,23 @@ fn qualifier(input: &str) -> ParseResult<Qualifier> {
 }
 
 // pre ::= parts
-fn pre(input: &str) -> ParseResult<SmallVec<VersionPreOrBuild>> {
+fn pre(input: &str) -> ParseResult<CowVec<VersionPreOrBuild>> {
   preceded(ch('-'), parts)(input)
 }
 
 // build ::= parts
-fn build(input: &str) -> ParseResult<SmallVec<VersionPreOrBuild>> {
+fn build(input: &str) -> ParseResult<CowVec<VersionPreOrBuild>> {
   preceded(ch('+'), parts)(input)
 }
 
 // parts ::= part ( '.' part ) *
-fn parts(input: &str) -> ParseResult<SmallVec<VersionPreOrBuild>> {
+fn parts(input: &str) -> ParseResult<CowVec<VersionPreOrBuild>> {
   if_true(
     map(separated_list(part, ch('.')), |text| {
       text
         .into_iter()
         .map(VersionPreOrBuild::from_str)
-        .collect::<SmallVec<_>>()
+        .collect::<CowVec<_>>()
     }),
     |items| !items.is_empty(),
   )(input)