Skip to content

Commit 01dcfee

Browse files
author
bors-servo
authored
Auto merge of #12319 - servo:stable-geckolib, r=larsbergstrom+SimonSapin
Use a stable compiler for build-geckolib <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #11815 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because CI already runs `./mach build-geckolib` <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12319) <!-- Reviewable:end -->
2 parents 35a23bf + e226288 commit 01dcfee

File tree

10 files changed

+14
-262
lines changed

10 files changed

+14
-262
lines changed

ports/geckolib/Cargo.lock

-167
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ports/geckolib/Cargo.toml

-19
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,12 @@ name = "geckoservo"
1010
path = "lib.rs"
1111
crate-type = ["staticlib"]
1212

13-
[features]
14-
default = ["servo_features"]
15-
16-
# Features that aren't actually required for geckolib, but match the ones used
17-
# in the full Servo build. Enabling this reduces the number of things
18-
# recompiled when building both Servo and geckolib in the same source tree.
19-
servo_features = [
20-
"heapsize",
21-
"selectors/unstable",
22-
"style/servo",
23-
"time",
24-
"url/query_encoding",
25-
"url/rustc-serialize",
26-
"uuid",
27-
]
28-
2913
[dependencies]
3014
app_units = "0.2.5"
3115
cssparser = "0.5.4"
3216
env_logger = "0.3"
3317
euclid = "0.7.1"
3418
gecko_bindings = {version = "0.0.1", path = "gecko_bindings"}
35-
heapsize = {version = "0.3.0", optional = true}
3619
lazy_static = "0.2"
3720
libc = "0.2"
3821
log = {version = "0.3.5", features = ["release_max_level_info"]}
@@ -42,10 +25,8 @@ smallvec = "0.1"
4225
string_cache = {version = "0.2.20", features = ["unstable"]}
4326
style = {path = "../../components/style", features = ["gecko"]}
4427
style_traits = {path = "../../components/style_traits"}
45-
time = {version = "0.1", optional = true, features = ["rustc-serialize"]}
4628
url = "1.0.0"
4729
util = {path = "../../components/util"}
48-
uuid = {version = "0.2", optional = true, features = ["v4", "serde"]}
4930

5031
[replace]
5132
"string_cache:0.2.20" = {path = "string_cache"}

ports/geckolib/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ extern crate cssparser;
88
extern crate env_logger;
99
extern crate euclid;
1010
extern crate gecko_bindings;
11-
#[cfg(feature = "servo_features")] #[macro_use] extern crate heapsize;
1211
#[macro_use]
1312
extern crate lazy_static;
1413
extern crate libc;

ports/geckolib/selector_impl.rs

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ pub type SharedStyleContext = style::context::SharedStyleContext<GeckoSelectorIm
1515
pub type PrivateStyleData = style::data::PrivateStyleData<GeckoSelectorImpl, GeckoComputedValues>;
1616
pub type Animation = style::animation::Animation<GeckoSelectorImpl>;
1717

18-
#[cfg(feature = "servo_features")]
19-
known_heap_size!(0, GeckoSelectorImpl, PseudoElement, NonTSPseudoClass);
20-
2118
#[derive(Debug, Clone)]
2219
pub struct GeckoSelectorImpl;
2320

ports/stable-rust/.gitignore

-1
This file was deleted.

ports/stable-rust/Cargo.toml

-6
This file was deleted.

ports/stable-rust/src/lib.rs

-10
This file was deleted.

0 commit comments

Comments
 (0)