Use smallvec for scope tracking (#118)

Manishearth · zbraniecki · commit 91bb69e4be21 · 2019-07-12T09:22:16.000-07:00
diff --git a/fluent-bundle/Cargo.toml b/fluent-bundle/Cargo.toml
@@ -27,6 +27,7 @@ failure = "^0.1"
 failure_derive = "^0.1"
 intl_pluralrules = "^1.0"
 rental = "^0.5.4"
+smallvec = "0.6.10"
 
 [[bench]]
 name = "resolver"
diff --git a/fluent-bundle/src/resolve.rs b/fluent-bundle/src/resolve.rs
@@ -40,7 +40,7 @@ pub struct Scope<'bundle, R: Borrow<FluentResource>> {
     /// Local args
     pub local_args: Option<HashMap<&'bundle str, FluentValue<'bundle>>>,
     /// Tracks hashes to prevent infinite recursion.
-    pub travelled: RefCell<Vec<u64>>,
+    pub travelled: RefCell<smallvec::SmallVec<[u64; 2]>>,
     /// Track errors accumulated during resolving.
     pub errors: Vec<ResolverError>,
 }
@@ -54,7 +54,7 @@ impl<'bundle, R: Borrow<FluentResource>> Scope<'bundle, R> {
             bundle,
             args,
             local_args: None,
-            travelled: RefCell::new(Vec::new()),
+            travelled: RefCell::new(smallvec::SmallVec::new()),
             errors: vec![],
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pub struct Scope<'bundle, R: Borrow<FluentResource>> {`
`40`	`40`	`/// Local args`
`41`	`41`	`pub local_args: Option<HashMap<&'bundle str, FluentValue<'bundle>>>,`
`42`	`42`	`/// Tracks hashes to prevent infinite recursion.`
`43`		`- pub travelled: RefCell<Vec<u64>>,`
	`43`	`+ pub travelled: RefCell<smallvec::SmallVec<[u64; 2]>>,`
`44`	`44`	`/// Track errors accumulated during resolving.`
`45`	`45`	`pub errors: Vec<ResolverError>,`
`46`	`46`	`}`
`@@ -54,7 +54,7 @@ impl<'bundle, R: Borrow<FluentResource>> Scope<'bundle, R> {`
`54`	`54`	`bundle,`
`55`	`55`	`args,`
`56`	`56`	`local_args: None,`
`57`		`- travelled: RefCell::new(Vec::new()),`
	`57`	`+ travelled: RefCell::new(smallvec::SmallVec::new()),`
`58`	`58`	`errors: vec![],`
`59`	`59`	`}`
`60`	`60`	`}`