Commit Graph

22 Commits

Author SHA1 Message Date
Anthony Ramine
fb18b1bc80 servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 4a0b730cafd09fbd6e5cbc00727caef9b3cae315

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ff60d998ee96372d2dc811e5e73b730801c4f5c9
2017-02-16 03:53:49 -08:00
Bobby Holley
fd99deb665 servo: Merge #15447 - Move rust-selectors into servo/servo (from bholley:in_tree_selectors); r=SimonSapin
See the thread at [1].

[1] https://groups.google.com/d/msg/mozilla.dev.servo/iHykieVC5SM/Z31_n0agBAAJ

Source-Repo: https://github.com/servo/servo
Source-Revision: 8aec1ccdd22145df0ca7bb9456b40b3175fc5992

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b45d7b526718eb826d64906aa7514f1806a074ae
2017-02-08 16:06:06 -08:00
Matt Brubeck
1008fcdc34 servo: Merge #15433 - Update a few dependencies (from mbrubeck:always-be-updating); r=KiChjang
This adds two new crates to the dependency graph: [error-chain] and [metadeps], which are both dual-licensed (MIT/Apache-2.0).

[error-chain]: https://crates.io/crates/error-chain
[metadeps]: https://crates.io/crates/metadeps

Source-Repo: https://github.com/servo/servo
Source-Revision: 96698dd05119ced20c4768630b50aab82f5fb86c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : bf1f3538e21fb2f742372633dd6a97d233287a0a
2017-02-07 14:18:50 -08:00
UK992
132fb1d5fd servo: Merge #15035 - Tidy: Report invalid listed ignored directories and files (from UK992:tidy-validate-ignore); r=Wafflespeanut
r? @Wafflespeanut

Source-Repo: https://github.com/servo/servo
Source-Revision: f4c6d0009209d83fdb66f8a7348065edf75a22ff
2017-01-19 01:12:06 -08:00
Ms2ger
720fdf561d servo: Merge #15044 - Remove the dependency on the num crate (from servo:remove-num); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 2fa4df8ae8cd6f90bbd86b71bfd8b9f582eb3751
2017-01-16 14:51:33 -08:00
Ms2ger
cf4c07e65f servo: Merge #15046 - Remove libloading from the list of packages that can have duplicated versions (from servo:libloading); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 44fa478d7bb87fea52ef4af78267738316f22587
2017-01-16 07:43:45 -08:00
Matthias Devlamynck
37fcd17201 servo: Merge #15023 - Moved tidy's BLOCKED_PACKAGES to the config file (from mdevlamynck:tidy-config); r=Wafflespeanut
<!-- Please describe your changes on the following line: -->
Moved tidy.py's BLOCKED_PACKAGES to servo-tidy.toml.

---
<!-- 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 #15014 (github issue number if applicable).

<!-- Either: -->
- [X] These changes do not require tests because this is a refactor and the existing tests have been adapted.

<!-- 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: 7eb811b837545c295506c25207c891126b6db0ff
2017-01-14 08:31:30 -08:00
Ms2ger
4cb0c1862f servo: Merge #14929 - Update image (from servo:update-image); r=mbrubeck
Source-Repo: https://github.com/servo/servo
Source-Revision: 12c71c57d178ee5bfd383063ddebb4763006eaf4
2017-01-11 05:37:45 -08:00
UK992
76bfd8c1e3 servo: Merge #14737 - Package: Various improvements (from UK992:package-prefs); r=Wafflespeanut
Fixes https://github.com/servo/servo/issues/11966
Fixes https://github.com/servo/servo/issues/12707

Also adds simple mechanism to set os specific prefs, by adding  like `os:macosx,os:windows;` before pref name.

Source-Repo: https://github.com/servo/servo
Source-Revision: b5f3d7dd413886037de8f1bc435ede34a98421b3
2016-12-29 10:28:37 -08:00
UK992
04302a98c4 servo: Merge #14715 - Tidy: Check Cargo.lock for packages with same version and different sources (from UK992:tidy-check-lock); r=SimonSapin
<!-- Please describe your changes on the following line: -->
r? @Wafflespeanut

cc @SimonSapin

---
<!-- 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 #14695

<!-- Either: -->
- [X] There are tests for these changes
<!-- 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: 37a5e29147f0dc489888377d6f7bb53282dc04f9
2016-12-26 08:57:04 -08:00
Ulf Nilsson
0a58c8a1e4 servo: Merge #14708 - Update jpeg-decoder to 0.1.10 and disallow duplicate rayon versions again (from kaksmet:update-jpeg-decoder); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: c25265273c012a1ecf371fb7b459c53486cb9024
2016-12-24 10:43:02 -08:00
Manish Goregaokar
a02e4aabea servo: Merge #14684 - Regen bindings (from Manishearth:regen); r=bholley
Source-Repo: https://github.com/servo/servo
Source-Revision: dd2aa4195ab1ac853a5b80c6aa0a0d9c1fae055c
2016-12-22 23:26:57 -08:00
Bobby Holley
8eb98de31a servo: Merge #14642 - Use Scoped TLS in the style system and eliminate UnsafeNode usage in the StyleSharingCandidateCache (from bholley:scoped_tls); r=emilio
See the discussion in https://bugzilla.mozilla.org/show_bug.cgi?id=1323372

@emilio Please review, but don't merge yet until we get the upstream changes into Rayon.

CC @SimonSapin @heycam @upsuper @Manishearth @pcwalton @nikomatsakis

Source-Repo: https://github.com/servo/servo
Source-Revision: 8fd8d6161426af386c0dfd3d13968a409474eb16
2016-12-21 11:11:12 -08:00
Corey Farwell
4f34642983 servo: Merge #14539 - Show the placeholder text for textarea elements (from frewsxcv:textarea-placeholder); r=mbrubeck
Fixes https://github.com/servo/servo/issues/10552.

All this logic was taken from htmlinputelement.rs.

Source-Repo: https://github.com/servo/servo
Source-Revision: 816b2969c34a43c51365ea2b49d90c08d434c9ea
2016-12-14 12:13:06 -08:00
Ravi Shankar
11bd8d6583 servo: Merge #14166 - Allow tidy to run custom project-specific lints (from Wafflespeanut:tidy); r=frewsxcv
<!-- Please describe your changes on the following line: -->

Since tidy is a package, it shouldn't contain our WPT lint. This PR changes the file list generator (we already have) into an object, and allows tidy to run custom python lint scripts (specified in the config file) under the context of `LintRunner`. The errors are then chained into our mechanism.

r? @frewsxcv (cc @jdm @edunham @aneeshusa and anyone else interested in reviewing it)

---
<!-- 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

<!-- Either: -->
- [x] There are tests for these changes

<!-- 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: 290a1696dc6b16c421a40dc08abdc072a2fb4cf2

--HG--
rename : servo/python/tidy/servo_tidy_tests/dir_check/only_webidl/test.webidl => servo/python/tidy/servo_tidy_tests/lints/not_script
2016-11-12 11:06:27 -06:00
Corey Farwell
29854caa74 servo: Merge #14134 - Fix ./mach clippy (from frewsxcv:cargo-clippy); r=jdm
Fixes https://github.com/servo/servo/issues/13117.

Source-Repo: https://github.com/servo/servo
Source-Revision: f1f97fb48ee3ac16a56f02d5b1fd8e28d1f94b9c
2016-11-09 01:23:55 -06:00
Eddy Bruel
8ccd0522b4 servo: Merge #14110 - Replace rust-websocket with ws-rs in the debugger server (from servo:ejpbruel-ws); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 04e2af0b222de22782c29eb0a20622e5717cd574
2016-11-07 12:47:58 -06:00
Yuki Izumi
fa4f7b60bd servo: Merge #14092 - Sort check on JSON (from kivikakk:sort-check); r=Wafflespeanut
<!-- Please describe your changes on the following line: -->
Check that JSON keys are ordered, and that there's no duplicates (for `resources/prefs.json` and `resources/package-prefs.json`).

---
<!-- 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]  🆕 `./mach test-tidy --self-test` does not report any errors
- [x] These changes fix #12283

<!-- Either: -->
- [x] There are tests for these changes 🎉

<!-- 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: 94d0c485e10138e0d5b2bd8b41b6a922a22a059f
2016-11-07 07:41:34 -06:00
Manish Goregaokar
05cfe1b1c7 servo: Merge #13701 - Vendor nsstring bindings, use for text-overflow (from Manishearth:nsstring); r=emilio,mystor
From [bug 1309165](https://bugzilla.mozilla.org/show_bug.cgi?id=1309165)

Source-Repo: https://github.com/servo/servo
Source-Revision: f584003191cc125b181bb8c555d8fae6eccd0e70
2016-10-12 08:28:27 -05:00
Gregory
6f603befa7 servo: Merge #13447 - Have tidy ensure that the there are no extra files in the webidls folder #13427 (from gterzian:check_webidls_folder_files); r=Wafflespeanut
<!-- Please describe your changes on the following line: -->
 Have tidy ensure that the there are no extra files in the webidls folder #13427

---
<!-- 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 #13427 (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes

<!-- 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: 3a5fd8b49a45b4647e9823d3e10243d9f4b2277b

--HG--
rename : servo/python/tidy/servo_tidy_tests/empty_file.rs => servo/python/tidy/servo_tidy_tests/dir_check/only_webidl/test.webidl
rename : servo/python/tidy/servo_tidy_tests/test_ignored/whee/test.rs => servo/python/tidy/servo_tidy_tests/dir_check/webidl_plus/test.rs
rename : servo/python/tidy/servo_tidy_tests/empty_file.rs => servo/python/tidy/servo_tidy_tests/dir_check/webidl_plus/test.test
rename : servo/python/tidy/servo_tidy_tests/empty_file.rs => servo/python/tidy/servo_tidy_tests/dir_check/webidl_plus/test.webidl
rename : servo/python/tidy/servo_tidy_tests/empty_file.rs => servo/python/tidy/servo_tidy_tests/dir_check/webidl_plus/test2.rs
2016-10-02 12:00:36 -05:00
Manish Goregaokar
30bfdcfd16 servo: Merge #13372 - Merge most of geckolib into style (from Manishearth:merge-stylo); r=emilio
Fixes #13038

r? @emilio

Source-Repo: https://github.com/servo/servo
Source-Revision: f763eca344fa6a49f2467d9baa25044bebc41ff2

--HG--
rename : servo/ports/geckolib/binding_tools/.gitignore => servo/components/style/binding_tools/.gitignore
rename : servo/ports/geckolib/binding_tools/README.md => servo/components/style/binding_tools/README.md
rename : servo/ports/geckolib/binding_tools/regen.py => servo/components/style/binding_tools/regen.py
rename : servo/ports/geckolib/binding_tools/regen.sh => servo/components/style/binding_tools/regen.sh
rename : servo/ports/geckolib/binding_tools/regen_atoms.py => servo/components/style/binding_tools/regen_atoms.py
rename : servo/ports/geckolib/binding_tools/setup_bindgen.sh => servo/components/style/binding_tools/setup_bindgen.sh
rename : servo/ports/geckolib/context.rs => servo/components/style/gecko/context.rs
rename : servo/components/style/gecko_conversions.rs => servo/components/style/gecko/conversions.rs
rename : servo/ports/geckolib/data.rs => servo/components/style/gecko/data.rs
rename : servo/components/style/generated/gecko_pseudo_element_helper.rs => servo/components/style/gecko/generated/gecko_pseudo_element_helper.rs
rename : servo/components/style/gecko_selector_impl.rs => servo/components/style/gecko/selector_impl.rs
rename : servo/ports/geckolib/snapshot.rs => servo/components/style/gecko/snapshot.rs
rename : servo/ports/geckolib/snapshot_helpers.rs => servo/components/style/gecko/snapshot_helpers.rs
rename : servo/ports/geckolib/traversal.rs => servo/components/style/gecko/traversal.rs
rename : servo/components/style/gecko_values.rs => servo/components/style/gecko/values.rs
rename : servo/ports/geckolib/wrapper.rs => servo/components/style/gecko/wrapper.rs
rename : servo/ports/geckolib/gecko_bindings/bindings.rs => servo/components/style/gecko_bindings/bindings.rs
rename : servo/ports/geckolib/gecko_bindings/lib.rs => servo/components/style/gecko_bindings/mod.rs
rename : servo/ports/geckolib/gecko_bindings/ptr.rs => servo/components/style/gecko_bindings/ptr.rs
rename : servo/ports/geckolib/gecko_bindings/structs_debug.rs => servo/components/style/gecko_bindings/structs_debug.rs
rename : servo/ports/geckolib/gecko_bindings/structs_release.rs => servo/components/style/gecko_bindings/structs_release.rs
rename : servo/ports/geckolib/gecko_bindings/sugar/mod.rs => servo/components/style/gecko_bindings/sugar/mod.rs
rename : servo/ports/geckolib/gecko_bindings/sugar/ns_css_shadow_array.rs => servo/components/style/gecko_bindings/sugar/ns_css_shadow_array.rs
rename : servo/ports/geckolib/gecko_bindings/sugar/ns_style_auto_array.rs => servo/components/style/gecko_bindings/sugar/ns_style_auto_array.rs
rename : servo/ports/geckolib/gecko_bindings/sugar/ns_style_coord.rs => servo/components/style/gecko_bindings/sugar/ns_style_coord.rs
rename : servo/ports/geckolib/gecko_bindings/sugar/ns_t_array.rs => servo/components/style/gecko_bindings/sugar/ns_t_array.rs
rename : servo/ports/geckolib/gecko_bindings/sugar/ownership.rs => servo/components/style/gecko_bindings/sugar/ownership.rs
rename : servo/ports/geckolib/string_cache/lib.rs => servo/components/style/gecko_string_cache/mod.rs
rename : servo/ports/geckolib/string_cache/namespace.rs => servo/components/style/gecko_string_cache/namespace.rs
2016-09-26 02:36:05 -05:00
UK992
dfcbb95338 servo: Merge #12877 - Tidy config file (from UK992:tidy-toml); r=Wafflespeanut
This is wip workaround for https://github.com/servo/servo/issues/10841
Adds ``servo-tidy.toml`` with configs and ignored dirs, files and packages.
This will allow to set custom configuration per repo.
It's an example how could config file looks like.
I want opinion on that, if this is right approaches and how to improve it.

cc @edunham

Source-Repo: https://github.com/servo/servo
Source-Revision: 1c9650cc90090784c63f5af55628ffe6b57c25ed
2016-08-20 22:27:06 -05:00