Skip to content
Permalink
Browse files

Update to uluru 0.2 and arrayvec 0.4

  • Loading branch information
mbrubeck committed Dec 7, 2017
1 parent 8e3056d commit 99c2db05495b0185d9f8b7f1a077c896d247831e

Some generated files are not rendered by default. Learn more.

@@ -18,7 +18,7 @@ flate2 = "0.2.0"
hyper = "0.10"
hyper_serde = "0.8"
hyper-openssl = "0.2.2"
immeta = "0.3.1"
immeta = "0.3.6"
ipc-channel = "0.9"
lazy_static = "1"
log = "0.3.5"
@@ -20,17 +20,13 @@ gecko = ["nsstring", "num_cpus",
"style_traits/gecko", "fallible/known_system_malloc"]
use_bindgen = ["bindgen", "regex", "toml"]
servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
"cssparser/serde", "encoding_rs", "malloc_size_of/servo",

# FIXME: Uncomment when https://github.com/servo/servo/pull/16953 has landed:
#"arrayvec/use_union"

"cssparser/serde", "encoding_rs", "malloc_size_of/servo", "arrayvec/use_union",
"servo_url"]
gecko_debug = ["nsstring/gecko_debug"]

[dependencies]
app_units = "0.5.5"
arrayvec = "0.3.20"
arrayvec = "0.4.6"
atomic_refcell = "0.1"
bitflags = "1.0"
byteorder = "1.0"
@@ -69,7 +65,7 @@ style_derive = {path = "../style_derive"}
style_traits = {path = "../style_traits"}
servo_url = {path = "../url", optional = true}
time = "0.1"
uluru = "0.1"
uluru = "0.2"
unicode-bidi = "0.3"
unicode-segmentation = "1.0"

@@ -515,7 +515,7 @@ pub struct SelectorFlagsMap<E: TElement> {
map: FnvHashMap<SendElement<E>, ElementSelectorFlags>,
/// An LRU cache to avoid hashmap lookups, which can be slow if the map
/// gets big.
cache: LRUCache<CacheItem<E>, [Entry<CacheItem<E>>; 4 + 1]>,
cache: LRUCache<[Entry<CacheItem<E>>; 4 + 1]>,
}

#[cfg(debug_assertions)]
@@ -1809,8 +1809,8 @@ impl SourcePropertyDeclaration {
}

fn push(&mut self, declaration: PropertyDeclaration) {
let over_capacity = self.declarations.push(declaration).is_some();
debug_assert!(!over_capacity);
let _result = self.declarations.try_push(declaration);
debug_assert!(_result.is_ok());
}
}

@@ -421,7 +421,7 @@ impl<E: TElement> StyleSharingTarget<E> {
}

struct SharingCacheBase<Candidate> {
entries: LRUCache<Candidate, [Entry<Candidate>; SHARING_CACHE_BACKING_STORE_SIZE]>,
entries: LRUCache<[Entry<Candidate>; SHARING_CACHE_BACKING_STORE_SIZE]>,
}

impl<Candidate> Default for SharingCacheBase<Candidate> {
@@ -12,7 +12,7 @@ size_of_test!(test_size_of_property_declaration, properties::PropertyDeclaration

// This is huge, but we allocate it on the stack and then never move it,
// we only pass `&mut SourcePropertyDeclaration` references around.
size_of_test!(test_size_of_parsed_declaration, properties::SourcePropertyDeclaration, 576);
size_of_test!(test_size_of_parsed_declaration, properties::SourcePropertyDeclaration, 568);

size_of_test!(test_size_of_selector_parse_error_kind, SelectorParseErrorKind, 40);
size_of_test!(test_size_of_style_parse_error_kind, ::style_traits::StyleParseErrorKind, 56);

0 comments on commit 99c2db0

Please sign in to comment.
You can’t perform that action at this time.