~[] to Vec in style/properties.rs.mako and selector_matching.rs

servo · May 4, 2014 · 093e9fd · 093e9fd
1 parent 58bbe65
commit 093e9fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/components/style/properties.rs.mako b/src/components/style/properties.rs.mako
@@ -527,7 +527,7 @@ pub mod longhands {
                 pub enum T {
                     normal,
                     none,
-                    Content(~[Content]),
+                    Content(Vec<Content>),
                 }
             }
             pub type SpecifiedValue = computed_value::T;
@@ -549,7 +549,7 @@ pub mod longhands {
                     },
                     _ => ()
                 }
-                let mut content = ~[];
+                let mut content = Vec::new();
                 for component_value in input.skip_whitespace() {
                     match component_value {
                         &String(ref value)
@@ -1332,8 +1332,8 @@ pub mod shorthands {
 
 
 pub struct PropertyDeclarationBlock {
-    pub important: Arc<~[PropertyDeclaration]>,
-    pub normal: Arc<~[PropertyDeclaration]>,
+    pub important: Arc<Vec<PropertyDeclaration>>,
+    pub normal: Arc<Vec<PropertyDeclaration>>,
 }
 
 impl<E, S: Encoder<E>> Encodable<S, E> for PropertyDeclarationBlock {
@@ -1349,8 +1349,8 @@ pub fn parse_style_attribute(input: &str, base_url: &Url) -> PropertyDeclaration
 
 
 pub fn parse_property_declaration_list<I: Iterator<Node>>(input: I, base_url: &Url) -> PropertyDeclarationBlock {
-    let mut important = ~[];
-    let mut normal = ~[];
+    let mut important = Vec::new();
+    let mut normal = Vec::new();
     for item in ErrorLoggerIterator(parse_declaration_list(input)) {
         match item {
             DeclAtRule(rule) => log_css_error(
@@ -1418,7 +1418,7 @@ pub enum PropertyDeclarationParseResult {
 
 impl PropertyDeclaration {
     pub fn parse(name: &str, value: &[ComponentValue],
-                 result_list: &mut ~[PropertyDeclaration],
+                 result_list: &mut Vec<PropertyDeclaration>,
                  base_url: &Url) -> PropertyDeclarationParseResult {
         // FIXME: local variable to work around Rust #10683
         let name_lower = name.to_ascii_lower();

diff --git a/src/components/style/selector_matching.rs b/src/components/style/selector_matching.rs
@@ -481,14 +481,14 @@ struct Rule {
 /// we can sort them.
 #[deriving(Clone)]
 pub struct MatchedProperty {
-    pub declarations: Arc<~[PropertyDeclaration]>,
+    pub declarations: Arc<Vec<PropertyDeclaration>>,
     source_order: uint,
     specificity: u32,
 }
 
 impl MatchedProperty {
     #[inline]
-    pub fn from_declarations(declarations: Arc<~[PropertyDeclaration]>) -> MatchedProperty {
+    pub fn from_declarations(declarations: Arc<Vec<PropertyDeclaration>>) -> MatchedProperty {
         MatchedProperty {
             declarations: declarations,
             source_order: 0,
@@ -960,7 +960,7 @@ mod tests {
                     selector: s.compound_selectors.clone(),
                     property: MatchedProperty {
                         specificity: s.specificity,
-                        declarations: Arc::new(~[]),
+                        declarations: Arc::new(Vec::new()),
                         source_order: i,
                     }
                 }