Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove servo_url dependency for geckolib

Browse source 
It seems mod attr is not used for geckolib at all, and that is the
only place where servo_url is still referenced for geckolib, so we
can just remove it.
This commit is contained in:
Xidorn Quan 2017-04-07 16:44:38 +10:00
parent 1b6c3e06bb
commit 3150a92651
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/Cargo.toml
View file

@ -18,7 +18,7 @@ use_bindgen = ["bindgen", "regex"]
servo = ["serde/unstable", "serde", "serde_derive", "heapsize", "heapsize_derive", servo = ["serde/unstable", "serde", "serde_derive", "heapsize", "heapsize_derive",
"style_traits/servo", "servo_atoms", "html5ever-atoms", "style_traits/servo", "servo_atoms", "html5ever-atoms",
"cssparser/heapsize", "cssparser/serde", "encoding", "cssparser/heapsize", "cssparser/serde", "encoding",
"rayon/unstable", "servo_url/servo"] "rayon/unstable", "servo_url", "servo_url/servo"]
testing = [] testing = []
[dependencies] [dependencies]
@ -52,7 +52,7 @@ servo_atoms = {path = "../atoms", optional = true}
servo_config = {path = "../config"} servo_config = {path = "../config"}
smallvec = "0.3" smallvec = "0.3"
style_traits = {path = "../style_traits"} style_traits = {path = "../style_traits"}
servo_url = {path = "../url"} servo_url = {path = "../url", optional = true}
time = "0.1" time = "0.1"
unicode-segmentation = "1.0" unicode-segmentation = "1.0"

4
components/style/attr.rs
View file

@ -19,7 +19,7 @@ use std::str::FromStr;
use std::sync::Arc; use std::sync::Arc;
use str::{HTML_SPACE_CHARACTERS, read_exponent, read_fraction}; use str::{HTML_SPACE_CHARACTERS, read_exponent, read_fraction};
use str::{read_numbers, split_commas, split_html_space_chars}; use str::{read_numbers, split_commas, split_html_space_chars};
#[cfg(not(feature = "gecko"))] use str::str_join; use str::str_join;
use values::specified::Length; use values::specified::Length;
// Duplicated from script::dom::values. // Duplicated from script::dom::values.
@ -166,7 +166,6 @@ impl AttrValue {
AttrValue::TokenList(tokens, atoms) AttrValue::TokenList(tokens, atoms)
} }
#[cfg(not(feature = "gecko"))] // Gecko can't borrow atoms as UTF-8.
pub fn from_atomic_tokens(atoms: Vec<Atom>) -> AttrValue { pub fn from_atomic_tokens(atoms: Vec<Atom>) -> AttrValue {
// TODO(ajeffrey): effecient conversion of Vec<Atom> to String // TODO(ajeffrey): effecient conversion of Vec<Atom> to String
let tokens = String::from(str_join(&atoms, "\x20")); let tokens = String::from(str_join(&atoms, "\x20"));
@ -335,7 +334,6 @@ impl AttrValue {
} }
} }
#[cfg(not(feature = "gecko"))] // Gecko can't borrow atoms as UTF-8.
impl ::std::ops::Deref for AttrValue { impl ::std::ops::Deref for AttrValue {
type Target = str; type Target = str;

4
components/style/lib.rs
View file

@ -71,7 +71,7 @@ extern crate selectors;
#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; #[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
#[cfg(feature = "servo")] #[macro_use] extern crate servo_atoms; #[cfg(feature = "servo")] #[macro_use] extern crate servo_atoms;
extern crate servo_config; extern crate servo_config;
extern crate servo_url; #[cfg(feature = "servo")] extern crate servo_url;
extern crate smallvec; extern crate smallvec;
#[macro_use] #[macro_use]
extern crate style_traits; extern crate style_traits;
@ -81,7 +81,7 @@ extern crate unicode_segmentation;
pub mod animation; pub mod animation;
#[allow(missing_docs)] // TODO. #[allow(missing_docs)] // TODO.
pub mod attr; #[cfg(feature = "servo")] pub mod attr;
pub mod bezier; pub mod bezier;
pub mod bloom; pub mod bloom;
pub mod cache; pub mod cache;