Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use a stable compiler for build-geckolib #12319

Merged
merged 8 commits into from Jul 9, 2016
Next

Remove geckolib’s "servo_features" Cargo feature

We’re about to switch to separate CARGO_TARGET_DIR (and different
compiler version) so we won’t be able to share build output with servo’s
"normal" build anyway.
  • Loading branch information
SimonSapin committed Jul 8, 2016
commit a39170728d91fa586e3ebdb050a4c35933d1de3c

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

@@ -10,29 +10,12 @@ name = "geckoservo"
path = "lib.rs"
crate-type = ["staticlib"]

[features]
default = ["servo_features"]

# Features that aren't actually required for geckolib, but match the ones used
# in the full Servo build. Enabling this reduces the number of things
# recompiled when building both Servo and geckolib in the same source tree.
servo_features = [
"heapsize",
"selectors/unstable",
"style/servo",
"time",
"url/query_encoding",
"url/rustc-serialize",
"uuid",
]

[dependencies]
app_units = "0.2.5"
cssparser = "0.5.4"
env_logger = "0.3"
euclid = "0.7.1"
gecko_bindings = {version = "0.0.1", path = "gecko_bindings"}
heapsize = {version = "0.3.0", optional = true}
lazy_static = "0.2"
libc = "0.2"
log = {version = "0.3.5", features = ["release_max_level_info"]}
@@ -42,10 +25,8 @@ smallvec = "0.1"
string_cache = {version = "0.2.20", features = ["unstable"]}
style = {path = "../../components/style", features = ["gecko"]}
style_traits = {path = "../../components/style_traits"}
time = {version = "0.1", optional = true, features = ["rustc-serialize"]}
url = "1.0.0"
util = {path = "../../components/util"}
uuid = {version = "0.2", optional = true, features = ["v4", "serde"]}

[replace]
"string_cache:0.2.20" = {path = "string_cache"}
@@ -8,7 +8,6 @@ extern crate cssparser;
extern crate env_logger;
extern crate euclid;
extern crate gecko_bindings;
#[cfg(feature = "servo_features")] #[macro_use] extern crate heapsize;
#[macro_use]
extern crate lazy_static;
extern crate libc;
@@ -15,9 +15,6 @@ pub type SharedStyleContext = style::context::SharedStyleContext<GeckoSelectorIm
pub type PrivateStyleData = style::data::PrivateStyleData<GeckoSelectorImpl, GeckoComputedValues>;
pub type Animation = style::animation::Animation<GeckoSelectorImpl>;

#[cfg(feature = "servo_features")]
known_heap_size!(0, GeckoSelectorImpl, PseudoElement, NonTSPseudoClass);

#[derive(Debug, Clone)]
pub struct GeckoSelectorImpl;

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.