Commit Graph

365 Commits

Author SHA1 Message Date
Josh Matthews
7f10c47c0a servo: Merge #11472 - Report blank lines that follow an open brace (from jdm:wip); r=mbrubeck
This automates something that I find myself frequently commenting on in PRs.

---
<!-- 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] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 3ec20d9cf517c67f4d280e8958cc58c4c2b4fbb2
2016-05-27 18:14:25 -05:00
Matt Brubeck
fb7884bf46 servo: Merge #11378 - Default to the same Cargo features in all build commands (from mbrubeck:debug-mozjs); r=larsbergstrom
Fixes #8308 and #7327. r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 2d4941660bd3a4a91f82145a3a468fbf165eaf94
2016-05-27 17:15:24 -05:00
Cullen Rhodes
2bd22f97ce servo: Merge #11329 - Report use statements that use {} with only one entry (from c-rhodes:11320); r=jdm
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 --faster` does not report any errors
- [X ] These changes fix #11320  (github issue number if applicable).

Either:
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2f9796fa696e9514280777398467696dd4f004b3
2016-05-27 07:11:17 -05:00
Rebecca
e65d7f0b7a servo: Merge #11429 - Partially enable referrer-policy tests with some modifications (from nox:unlimited-referrer-works); r=jdm
This is a part of @rebstar6's work on #11422, with only her test fixes and the enabling of them, to ease review on the actual implementation.

Source-Repo: https://github.com/servo/servo
Source-Revision: c432e9ac540add7a7224cb20af98519544ae0189
2016-05-26 18:21:04 -05:00
Simon Sapin
73404ec327 servo: Merge #11374 - Don’t include microsecons when reporting build times (from servo:no-microseconds); r=Ms2ger
"0:03:40.817715" is harder to read and no more informative than "0:03:40"

Source-Repo: https://github.com/servo/servo
Source-Revision: 345b8b9c00b146259b2b665775c3a5aa7ded6056
2016-05-25 21:31:48 -05:00
Mitchell Hentges
22e66c3da8 servo: Merge #11409 - Remove --faster flag from test-tidy, go fast by default. Fixes 11217 (from mitchhentges:test-tidy-faster-default); r=aneeshusa
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 #11217 (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they just change command-line options, which aren't tested

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

This finishes #11267

Source-Repo: https://github.com/servo/servo
Source-Revision: ebb690d28c3c36ffba7059b64361fed3847861c7
2016-05-25 17:16:15 -05:00
Per Lundberg
5bc2b16822 servo: Merge #11393 - Fixed the build tools to handle cargo being named cargo.exe (from perlun:fix/find-cargo-exe-on-windows); r=metajack
It's actually quite weird that I had to do this, but I got errors without it (on Windows). I noted the `BIN_SUFFIX` existed elsewhere so it felt logical to use it here also.

Source-Repo: https://github.com/servo/servo
Source-Revision: 40b2d424c08ce089dba8800fa310097276b3607e
2016-05-25 12:41:30 -05:00
Mitchell Hentges
a2eb9bbc8a servo: Merge #11267 - Add --all option to mach test-tidy, with compatibility with --faster (from mitchhentges:test-tidy-sanic-by-default); r=aneeshusa
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 --faster` does not report any errors
- [X] These changes partially fix #11217

Either:
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because it just affects `mach` script parameters

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Source-Repo: https://github.com/servo/servo
Source-Revision: b6e06bd83740ea5dc3385f88daf88677fc676f11
2016-05-24 16:54:12 -07:00
Mitchell Hentges
fd9af4a433 servo: Merge #11278 - Reduce 'android-18' duplication by putting it in $ANDROID_TARGET env variable (from mitchhentges:8348-reduce-duplication); r=aneeshusa
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 --faster` does not report any errors
- [x] These changes fix #8348

Either:
- [X] These changes do not require tests because ~~I'm lazy~~ it's a configuration change, and asserting default values is usually tedious and not very helpful

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

---

Allegedly, this broke the build [back in the day](https://github.com/servo/servo/pull/8519).
Going to see if it's a piece of cake to land now

Source-Repo: https://github.com/servo/servo
Source-Revision: ea38ccfdfe12c64d41ff460f358e21cafead8414
2016-05-24 13:08:05 -07:00
Paul Rouget
39c45544a4 servo: Merge #11332 - browserhtml update (from paulrouget:bhtmlUpdate); r=Manishearth
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it's a package update

Source-Repo: https://github.com/servo/servo
Source-Revision: aa9fc4e0549c54fafef358a50f32f520c9014ba6
2016-05-22 21:28:17 -07:00
Jack Moffitt
7477ed85bc servo: Merge #11314 - Make Servo DPI aware on Windows (from metajack:window-hi-dpi); r=mbrubeck
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 --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because testing would be overly difficult

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

This implements system level DPI awareness for Windows. It has three
parts:

1. Add a application manifest which is copied alongside servo.exe during
build that declares our DPI awareness level. This is needed otherwise
DPI queries will return 96dpi and our application will be upscaled on
high DPI displays.

2. Rename hidpi_factor to avoid confusion with Glutin's hidpi_factor
which does something else.

3. Correctly convert windows sizes on window creation for
Windows. Unlike OS X, Windows uses device pixels for window creation.

Source-Repo: https://github.com/servo/servo
Source-Revision: 63bbc13fffeaa14f15ff9270f7d6355fab4d3d56
2016-05-20 22:41:07 -07:00
Bobby Holley
7d70cec87c servo: Merge #11242 - Add basic support for Gecko atoms (from bholley:gecko_atoms); r=emilio
This is a rough initial implementation of gecko atoms. This allows us to get rid of the custom rust-selectors branch we use to build stylo.

The gecko changes are at https://bugzilla.mozilla.org/show_bug.cgi?id=1273771

Source-Repo: https://github.com/servo/servo
Source-Revision: e3be7184fb79d9d0b7b2a491769a58c59a990460
2016-05-18 11:35:28 -07:00
Ms2ger
ec0e4ebb3f servo: Merge #11243 - Move constellation into its own crate (from Ms2ger:constellation); r=nox
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 --faster` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because refactoring

Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process.

Source-Repo: https://github.com/servo/servo
Source-Revision: 872565bb4bd2883c6fe926da74e3b3e2b74e6d34

--HG--
rename : servo/components/compositing/constellation.rs => servo/components/constellation/constellation.rs
rename : servo/components/compositing/timer_scheduler.rs => servo/components/constellation/timer_scheduler.rs
2016-05-18 02:11:46 -07:00
Florian Duraffourg
f0de867f29 servo: Merge #11196 - Add unit tests for cookies handling (from fduraffourg:master); r=jdm
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 #9965

Either:
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

Add unit tests for the `net` component about cookies. The tests are generated
with a new `mach update-net-cookies` command from this repo: https://github.com/abarth/http-state.

This PR also includes two trivial bug fixes about cookie handling.

From all the tests included, the following ones are currently failing:

- cookie_http_state::test_0003
- cookie_http_state::test_0006
- cookie_http_state::test_attribute0004
- cookie_http_state::test_attribute0005
- cookie_http_state::test_attribute0007
- cookie_http_state::test_attribute0008
- cookie_http_state::test_domain0017
- cookie_http_state::test_mozilla0001
- cookie_http_state::test_mozilla0002
- cookie_http_state::test_mozilla0003
- cookie_http_state::test_mozilla0005
- cookie_http_state::test_mozilla0007
- cookie_http_state::test_mozilla0009
- cookie_http_state::test_mozilla0010
- cookie_http_state::test_mozilla0013

`test_000[36]` and `test_mozilla*` are failing because there is currently no
method to clean a `net::cookie_storage` from expired cookies.

`test_attribute000[4578]` are failing because hyper does not parse the `Secure`
attribute correctly. I will open an issue on the upstream project.

`test_domain0017` fails because the TLD .org is not on the PUB_DOMAINS list.

Source-Repo: https://github.com/servo/servo
Source-Revision: c519739b7bcf408f2f671a89729aa30f39dd67a1
2016-05-17 16:34:16 -07:00
Anthony Ramine
61bd80a453 servo: Merge #11191 - Update bitflags to 0.7 (from servo:bitflags); r=pcwalton
- [x] https://github.com/servo/cocoa-rs/pull/126 https://github.com/servo/cocoa-rs/pull/127 https://github.com/servo/cocoa-rs/pull/128 https://github.com/servo/glutin/pull/91
- [x] https://github.com/cyderize/rust-websocket/pull/78
- [x] https://github.com/sfackler/rust-openssl/pull/393
- [x] https://github.com/PistonDevelopers/image-png/pull/36
- [x] https://github.com/servo/rust-selectors/pull/87
- [x] https://github.com/vberger/wayland-kbd/pull/12
- [x] https://github.com/vberger/wayland-client-rs/pull/50
- [x] https://github.com/netvl/xml-rs/pull/122 https://github.com/netvl/xml-rs/pull/123

Source-Repo: https://github.com/servo/servo
Source-Revision: 6c08ad857ea4139bb266c481eebe4315bdd460d5
2016-05-17 15:43:14 -07:00
Anthony Ramine
89660bce3f servo: Merge #11211 - Implement --pref in test-wpt (from nox:test-wpt-pref); r=jgraham
Needed to test GC zeal.

Source-Repo: https://github.com/servo/servo
Source-Revision: 02399d90c175239f7ed9fafa1470dc8e0e9820eb
2016-05-17 12:35:45 -07:00
aeischeid
0ca1c50fb0 servo: Merge #10713 - add tidy test for space after ":" in stucts (from aeischeid:master); r=jdm
Addresses issue #10702

the tidy self-test doesn't seem to catch the `member_name:"Foo"` line like it should. the regex follows similar pattern in the file and works in my regex tester tool, so not really sure what is going on there.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8c2c0bd964bfbf1a2d7494bd8fbbdd263173ef7d
2016-05-11 16:27:37 -07:00
Bobby Holley
dad21c2a95 servo: Merge #11121 - Hoist gecko bindings into their own crate (from bholley:hoist_bindings); r=mbrubeck
This will be helpful for leveraging the bindings with our nsIAtom-backed
string_cache replacement.

Source-Repo: https://github.com/servo/servo
Source-Revision: 49fd06089de8357c0d139f6aa623cde55ccd9ef0

--HG--
rename : servo/ports/geckolib/bindings.rs => servo/ports/geckolib/gecko_bindings/bindings.rs
rename : servo/ports/geckolib/gecko_style_structs.rs => servo/ports/geckolib/gecko_bindings/structs.rs
rename : servo/ports/geckolib/tools/.gitignore => servo/ports/geckolib/gecko_bindings/tools/.gitignore
rename : servo/ports/geckolib/tools/README.md => servo/ports/geckolib/gecko_bindings/tools/README.md
rename : servo/ports/geckolib/tools/regen_style_structs.sh => servo/ports/geckolib/gecko_bindings/tools/regen_style_structs.sh
rename : servo/ports/geckolib/tools/setup_bindgen.sh => servo/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh
2016-05-11 14:59:04 -07:00
Matt Brubeck
ae38180d6b servo: Merge #11122 - Use the same build environment and features for CEF, Servo, Gonk, Geckolib (from mbrubeck:unify-builds); r=larsbergstrom
* Remove unnecessary dependencies and features from top-level Cargo.tomls.  The features for each crate will be computed based on the union of features specified in the dependency graph.  Specifying the same ones again just adds more ways for them to get out of sync.
* Move all cargo build environment variables into CommandBase

Fixes #11112. r? @metajack

(Not included: CI test to make sure #11112 doesn't regress again.)

Source-Repo: https://github.com/servo/servo
Source-Revision: 7f76e3ba74a11f1f4bb46f12e17c06270175908f
2016-05-11 12:35:32 -07:00
Matt Brubeck
1edc0e5780 servo: Merge #11135 - Override $CARGO_HOME only if cargo-home-dir is in .servobuild (from mbrubeck:cargo-home); r=larsbergstrom
This preserves the fix from #11097 in the situation where `$CARGO_HOME` and `cargo-home-dir` in `.servobuild` are both present: `.servobuild` should win.

But it changes the behavior when `$CARGO_HOME` is present and `.servobuild` is not:  Then `$CARGO_HOME` should be used.

We now check the following values in order of priority and use the first one that is found:

1. `cargo-home-dir` in `.servobuild`
2. `CARGO_HOME` in the environment
3. default value (`<servo-repo>/.cargo`)

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: fcebfcc1130b7b3e74f14c8375f825f148e0f152
2016-05-11 11:37:05 -07:00
Tetsuharu OHZEKI
b9d8671144 servo: Merge #11097 - Override always 'CARGO_HOME' env variable (from saneyuki:cargo_home); r=larsbergstrom
This use always `cargo-home-dir` in `/.servobuild` even if you set `CARGO_HOME` in your shell.

If you use [racer][racer] with [rustup (multirust.rs)][rustup], you may set `CARGO_HOME` env variable to your shell. Then the previous code would be a problem which does not use `cargo-home-dir` in `/.servobuild`.

[racer]: https://github.com/phildawes/racer
[rustup]: https://github.com/rust-lang-nursery/rustup.rs

Source-Repo: https://github.com/servo/servo
Source-Revision: 0617727f5b58d1c4ebb10cf081f5952b7961fbf4
2016-05-10 08:20:47 -07:00
Adrian Utrilla
dab36bd33c servo: Merge #11073 - Added tox.ini (from autrilla:tox); r=Ms2ger
The default maximum line length Python linters use is 79, so a bunch of editor plugins complain about line lengths, unless you have a tox.ini telling the linter to ignore line lengths (E501) explicitly.

Source-Repo: https://github.com/servo/servo
Source-Revision: c3323f3c70ab53e5fe2f9aae7ba26b1a21cd622a
2016-05-09 01:37:09 -07:00
Adrian Utrilla
4833c5ded6 servo: Merge #11067 - Mach now shows stderr when a virtualenv or pip call fails (fixes #11055) (from autrilla:mach-errors); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: c226bf85a9476a7a701a69974dfa0893c0e6bcb5
2016-05-07 13:15:40 -07:00
Matt Brubeck
ec3d2c19c3 servo: Merge #11054 - Update hyper, openssl, wayland, threadpool, offscreen_gl_context (from mbrubeck:always-be-updating); r=Ms2ger
Gets rid of duplicate versions of bitflags and xml-rs!

Source-Repo: https://github.com/servo/servo
Source-Revision: e94f489e55e0fafed1c88b4d8f833f23545fc48b
2016-05-07 03:19:24 -07:00
Olaf Buddenhagen
43797c2d3d servo: Merge #11013 - mach run --debug: Use nicer syntax in rust-gdb/rust-lldb check (from antrik:rust-gdb-cleanup); r=Ms2ger
After actually reading a Python tutorial, I realised this can be handled
in a more elegant fashion :-)

Source-Repo: https://github.com/servo/servo
Source-Revision: 283eb4129664593f050e95c092e672a18f4658fc
2016-05-06 05:43:58 -07:00
Mátyás Mustoha
37825c1d2a servo: Merge #10916 - Use NEON build flag on ARM and AArch64 (from mmatyas:useneon); r=aneeshusa
The NEON flag is already used when building for Android, this patch enables it on other ARM devices too.

Note that this patch just adds the build flag to the compilation, for actually enabling the SIMD code in Servo, we'll also need #10900 (but it's not a dependency).

Source-Repo: https://github.com/servo/servo
Source-Revision: a233d1e39b9549f7b24937ca4de9de0719bb890c
2016-05-05 14:44:03 -07:00
Fabrice Desré
ad8cb99e4e servo: Merge #11011 - Make build time display more human friendly (from fabricedesre:friendly-time); r=jdm
I mean, I like to convert seconds in my head, only almost every day ;)

Source-Repo: https://github.com/servo/servo
Source-Revision: fb5e00c2944533a4b365d26aadc41ca5b10cfefb
2016-05-05 03:27:31 -07:00
Matt Brubeck
c6fe506242 servo: Merge #10997 - Upgrade to OpenSSL 1.0.1t on Android (from mbrubeck:openssl-1.0.1t); r=aneeshusa
Source-Repo: https://github.com/servo/servo
Source-Revision: 7a439e62371189a986f3339b80b70e76642dc060
2016-05-04 06:18:28 -07:00
Corey Farwell
5e3da56855 servo: Merge #10984 - Minor python/README fixes (from frewsxcv:python-cleanup); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 7533013c169ecda0733c3eefc3578e3e05c6cf03
2016-05-03 03:20:19 -07:00
Corey Farwell
5ba2811008 servo: Merge #10976 - Upgrade mach to 0.6; stop vendoring mach (from frewsxcv:novendor-mach); r=mbrubeck
When I originally rewrote Servo's mach bootstrapping (using virtualenv
w/ requirements.txt in #7103), I didn't specify mach as a requirement
because a new version hadn't been published in a while. Now that 0.6
is out, I asked the mach maintainers to publish a new version on PyPI,
so now we can fetch it like the other Python dependencies.

Fixes https://github.com/servo/servo/issues/10728.

Source-Repo: https://github.com/servo/servo
Source-Revision: e39ed932cb8c67eac98d44d00ed5bf642c026846
2016-05-02 18:07:25 -07:00
Matt Brubeck
ffeadc8422 servo: Merge #10975 - Update even more dependencies (from mbrubeck:more-deps); r=KiChjang
Adds a temporary exception to allow multiple versions of lazy_static. PRs have already been filed on the packages that are still using the old version.

Source-Repo: https://github.com/servo/servo
Source-Revision: 361b2b900eeea821a9a79d8566f8cd31dfb1b1ea
2016-05-02 16:48:45 -07:00
askeing
7833eac81c servo: Merge #10923 - Remove dir by shutil.rmtree, remove file by os.remove (from askeing:fix_10922); r=jdm
fix #10922

Source-Repo: https://github.com/servo/servo
Source-Revision: 491b5ff47e392f37cb636bbbdeecf5cd6254b401
2016-04-30 03:42:18 -07:00
askeing
9d3b92895f servo: Merge #10901 - Handle HTTP specific errors then other errors when downloading rustc (from askeing:fix_10882); r=jdm
fix #10882

Source-Repo: https://github.com/servo/servo
Source-Revision: a98a53925f09a1b1d65c4680ca7990f9ac3ee1bc
2016-04-30 01:54:44 -07:00
CorcovadoMing
1e505b370b servo: Merge #10892 - Pass --no-patch by default to update_css (from CorcovadoMing:patch-1); r=Wafflespeanut
fix #10884 according to #9666

Source-Repo: https://github.com/servo/servo
Source-Revision: f932db34c85dcd65a46ddde3ce0d8f6c92c28b7b
2016-04-28 16:19:35 -07:00
Simon Sapin
294083b11e servo: Merge #10855 - Make css-properties.json checking a proper unit test (from servo:unit); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 55d14ffe001189a648c79512753fb9260a4b4c5d
2016-04-28 07:16:57 -07:00
askeing
cdc6e6ecd3 servo: Merge #10835 - Adding parameter to tidy for skipping print text when running tests (from askeing:fix_10832); r=Wafflespeanut
fix #10832

Source-Repo: https://github.com/servo/servo
Source-Revision: b853383afc6760286018933b400925e1dbd6a48a
2016-04-25 12:48:49 -07:00
Maciej Skrzypkowski
56f2deedc3 servo: Merge #10775 - Test for tidy.check_lock function #9152 (from mskrzypkows:tidy_tests); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: edb58040c82c9c333e0c0a04051e17ed6fb17bd7
2016-04-25 00:19:33 -07:00
Zbynek Winkler
30fc93bdf2 servo: Merge #10786 - tidy check for vim and emacs modelines (from zwn:tidy-modelines); r=Manishearth
See #10719.

It skips *.webidl files for now since I am not sure where they come from and if they should be edited in tree or not.

Source-Repo: https://github.com/servo/servo
Source-Revision: 04f8ae56db0ba9df798b39a5b2f1bb1e23d6dcf3
2016-04-22 21:46:30 -07:00
Zbynek Winkler
170606fd25 servo: Merge #10706 - Turn on unused-extern-crates warning (from zwn:unused-extern-crates); r=nox
As discussed in #9256. It should solve second half of the issue.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0a3a50a1293e4e8f3e04161014d03802765140c7
2016-04-22 13:40:38 -07:00
Zbynek Winkler
c70e781908 servo: Merge #10751 - Report lines starting with && in tidy (from zwn:tidy-start-operator); r=Wafflespeanut
Partial implementation of the issue #10692 (the easy part).

Source-Repo: https://github.com/servo/servo
Source-Revision: d926b5d3762a101d5280266f806f2b979f73b695
2016-04-22 10:40:06 -07:00
Josh Matthews
e52f0bb30b servo: Merge #10758 - Ensure that we aren't missing any errors in the tidy self-test (from jdm:tidy_check_completeness); r=Wafflespeanut
r? @Wafflespeanut

Source-Repo: https://github.com/servo/servo
Source-Revision: 6f801e3f3f806f55fd955a469ed175915f24d6cb
2016-04-22 02:40:29 -07:00
Per Lundberg
4887f0639b servo: Merge #10774 - Improve properties.mako.rs file structure, take 2 (from perlun:improve-mako-file-structure-v2); r=SimonSapin
This is a new attempt of #10586, after Simon Sapin's great cleanups in #10749 has landed. I have adjusted the changes to the new structure that was introduced, and also only done a few of the longhand ones. Will certainly continue on this as soon as we have a basic agreement that this style is reasonable.

Source-Repo: https://github.com/servo/servo
Source-Revision: 69acd8e1ccba8ff01e8f7fde4305956ba5ab866d
2016-04-22 01:50:28 +05:01
Ms2ger
4a10bd0f0e servo: Merge #10631 - Update wptrunner (from servo:wptrunner-20160415); r=KiChjang
Fixes #10540.
Fixes #10392.

Source-Repo: https://github.com/servo/servo
Source-Revision: 9c172f49d08fe9019b0ba193ea4d75c6ddb95cda
2016-04-21 13:25:19 +05:01
Simon Sapin
b45aa4fc4d servo: Merge #10749 - Prepare related files to make it easier to split up the Mako template (from servo:split-mako); r=nox
https://github.com/servo/servo/pull/10586#issuecomment-211490049

r? @nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 3bfa4cc7414fea760ce5c503bfbcf25262acb9d7

--HG--
rename : servo/components/style/Mako-0.9.1.zip => servo/components/style/properties/Mako-0.9.1.zip
rename : servo/components/style/properties.html.mako => servo/components/style/properties/properties.html.mako
rename : servo/components/style/properties.mako.rs => servo/components/style/properties/properties.mako.rs
2016-04-21 10:09:09 +05:01
edunham
8391ee712f servo: Merge #10715 - Allow another wording of apache2/MIT (used by gaol) (from edunham:tidy-licenses); r=larsbergstrom
r? @larsbergstrom

need this for https://github.com/servo/servo/issues/10636

Source-Repo: https://github.com/servo/servo
Source-Revision: a129ce1bccf313db85547a5c32ecf8cd7aac489b
2016-04-20 01:31:16 +05:01
rwa
acceb114f9 servo: Merge #10689 - Handle URLError in download() #10679 (from rwakulszowa:bootstrap-disconnected-message); r=Wafflespeanut
Print a human-friendly message if there is no internet connection.

Source-Repo: https://github.com/servo/servo
Source-Revision: f73c6143d5375db80fd2e0b7de96a99c78b5866b
2016-04-19 07:54:36 +05:01
askeing
74c4289c9f servo: Merge #10653 - Cleanup tidy for external deps (from askeing:cleanup_tidy_for_external_deps); r=edunham
fix #10639

Source-Repo: https://github.com/servo/servo
Source-Revision: 4d80e0634ed58580a7d30fc7f57e6bdf4aa4e19d
2016-04-19 01:52:01 +05:01
Adrian Utrilla
7d4e1d95db servo: Merge #10620 - Improved readability of ensure_bootstrapped (from autrilla:mach-command-improvements); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: a87fa103b89213b9306be35dd26980aed22207e0
2016-04-17 10:52:41 +05:01
edunham
cbb91b0763 servo: Merge #10635 - Docs and cleanup after moving tidy (from edunham:tidy-cleanup); r=larsbergstrom
Missed a couple things in https://github.com/servo/servo/pull/10590

`licenseck.py` was moved into `tidy/servo_tidy/licenseck.py` by the prior PR

r? @larsbergstrom (sorry for PR spamming today)

Source-Repo: https://github.com/servo/servo
Source-Revision: 9d23d7c0d98e24995243487b55abbf2acd1ec354
2016-04-16 05:36:09 +05:01
Adrian Utrilla
3dae856f68 servo: Merge #10616 - #10614: Mach install now builds servo if it hasn't been built before (from autrilla:10614); r=edunham
Source-Repo: https://github.com/servo/servo
Source-Revision: 7c615233d88967f79efbf78618eda3f3a8479e88
2016-04-16 00:13:04 +05:01