Граф коммитов

55 Коммитов

Автор SHA1 Сообщение Дата
tigercosmos cd78f6e385 servo: Merge #19559 - implement valid week string (from tigercosmos:t1); r=KiChjang
<!-- Please describe your changes on the following line: -->
implement valid week string
part of #19172

r? @KiChjang

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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 8798e498892524ebb42ab8d7613c68033fdd1db8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5b0f9bb1d931cecf47f47da8af052740494cd1bd
2017-12-17 03:50:33 -06:00
Matt Brubeck f8fdec5746 servo: Merge #19525 - Update to webdriver 0.33 (from mbrubeck:deps); r=nox
Removes the extra version of the `cookie` crate

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b7b0c6e20e3d75414de87d9ccddf2bb177ed5d18
2017-12-08 10:29:08 -06:00
Simon Sapin a869d43078 servo: Merge #19510 - Update some dependencies, remove heapsize from the build (from servo:heapsize); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: 07bd84ecc8dc9ba56df873453696993118e18583

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 92be8729bbeadf778435c95878ddef5c3195879c
2017-12-08 07:49:54 -06:00
Glenn Watson aae0c25865 servo: Merge #19414 - Update WR (AA on transformed box-shadows, resource leak fixes) (from glennw:update-wr-leaks); r=wafflespeanut
Source-Repo: https://github.com/servo/servo
Source-Revision: e64647188879b8269b62c1d5c8aa05732ab9d96d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5a0d09d3ae5f2ac49d71d8add1303ee51ed77533
2017-12-07 00:57:40 -06:00
Bastien Orivel 7c6e509871 servo: Merge #19487 - Update lazy_static to 1.0 (from Eijebong:bump); r=jdm
For now it'll be duplicated

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : dfcd68496ca486045b0b0bc0c51ea4293d8487de
2017-12-05 10:31:16 -06:00
Anthony Ramine b7f989e2f9 servo: Merge #19433 - Update openssl to 0.9.22 (from servo:bumps); r=emilio
This removes foreign-types 0.2.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 41dedb605eaaa0d5adbae4a4f09249652d46bdbc
2017-11-30 09:33:20 -06:00
Dzmitry Malyshau 36090d6c06 servo: Merge #19314 - Update WR and the whole macOS crate stack (from servo:wr); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 37fa711657e6684e234e855be03470a0e17307de

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 32bc1b95ef736f61e86d6802d3acef52477adde3
2017-11-21 18:40:36 -06:00
Josh Matthews 9245d92e5c servo: Merge #19318 - Make wdspec tests runnable (from jdm:webdriver); r=jgraham
This makes it possible to run tests in tests/wpt/web-platform-tests/webdriver/tests and focus on investigating why they fail.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix (partially) #15274.
- [x] There are tests for these changes

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 47dad9396967053f7849320a2445a66ea03db895
2017-11-21 12:25:55 -06:00
Anthony Ramine 5532bcffa4 servo: Merge #19152 - Include gecko-media in the dependency graph (from nox:media); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: d7b4471c8080c0916277b967994bffcade759c3a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a02befdfd15dd98d2eb177cb1c864d4569137c59
2017-11-14 11:51:34 -06:00
Simon Sapin 3fedeb4793 servo: Merge #18821 - Update metadeps to remove duplicate error-chain crate (from servo:dupdep); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: ff1b58385cc904db8c06c79e66b8027db83d27dc

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4454bf5984bb0dcf772f9845f09a9f18b81d91fe
2017-11-09 13:20:27 -06:00
Imanol Fernandez 3497b6c815 servo: Merge #19091 - Add WebGL conformance 2.0.0 tests (from MortimerGoro:webgl2_suite); r=jdm
<!-- Please describe your changes on the following line: -->

This PR includes WebGL conformance 2.0.0 tests. For now I have disabled three folders in the new suite:
- `Conformance`: Tests WebGL 1.0 API like the current 1.0.3 suite we are using, but it includes a lot more tests and many expectations have to be updated. This is better to do in a separate PR because it will require to update github intermittent paths again and maybe detect new intermittents.
- `Conformance2\textures`: It causes a lot of timeouts because of using videos, svgs, and other complicated formats.
- `deqp`: It's a extra GPU testing suite included in the Khronos 2.0.0 suite. Disabled for now because it causes some timeouts.

So in a nutshell, it uses part of the 2.0.0 suite to test webgl 2.0 and keeps using 1.0.3 in order to test WebGL 1.0. It's good enough to enable TDD for the new WebGL 2.0 features

We can create follow-up issues for the next steps:
* deprecate 1.0.3 and use the new 'conformance' folder in 2.0.0 in order to test WebGL 1.0
* Enable `conformance2/textures` and  'deqp' tests once WebGL 2.0 implementation is more advanced or the timeouts are monitored in more detail.

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 92b49010b107ffd8be9169a1c979710338dc24c4

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 26a7a8fc2de70863d0e85ffb7d2b2da439dac2b9
2017-11-02 15:52:42 -05:00
Josh Matthews 58a2d9e8a4 servo: Merge #19070 - Enable CSS tests (from jdm:csstests); r=metajack
Do not merge this; I'm looking into what it takes to stop running the test-css jobs.

Source-Repo: https://github.com/servo/servo
Source-Revision: 86b9e7d7d604e00cfd7ab63351d3221cd5cf872e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d8969e7ae8baab672e88a4f8812872a1f86781b4
2017-11-02 11:35:01 -05:00
Imanol Fernandez 3aadf14880 servo: Merge #19065 - Import WebGL tests separately from web-platform-tests (from MortimerGoro:webgl_wpt); r=jdm
Import WebGL tests separately from web-platform-tests

<!-- Please describe your changes on the following line: -->
See https://github.com/servo/servo/issues/17140

Changes included in this PR:

- Move  webgl tests  from web-platform-tests to mozilla tests
- Create a mach command to allow easy updating from Khronos WebGL upstream ( `./mach update-webgl` or  `./mach update-webgl --version 1.0.3`)
- Fix WebGL patches to make them compatible with upstream.
- Sync with upstream 1.0.3 WebGL conformance suite using the new `./mach update-webgl` command

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

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5d8518b60d73c56c218cde9bdc91d840ba5b25ea
2017-10-31 10:04:45 -05:00
Nika Layzell d89819000a servo: Merge #18993 - Move nsstring from gecko into servo/support/gecko/nsstring (from mystor:nsstring2); r=mystor
This is the servo side of bug 1403213.

Take 2 of #18941 which got backed out because we botched the landing of the gecko side and I wasn't able to fix it in time.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0e6946fd9c279425e66721e6eb2b1e323e4c640f

--HG--
rename : servo/components/style/gecko_bindings/nsstring_vendor/src/lib.rs => servo/support/gecko/nsstring/src/lib.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 6d2fb196b2ed25c0201097d20e07b2e757096d00
2017-10-23 17:26:28 -05:00
Sebastian Hengst e045239d71 Backed out changeset 196206f129ef (bug 1403213) for referencing non-existing xpcom/rust/gtest/moz.build in xpcom/moz.build. r=backout on a CLOSED TREE
--HG--
rename : servo/support/gecko/nsstring/src/lib.rs => servo/components/style/gecko_bindings/nsstring_vendor/src/lib.rs
extra : amend_source : 38517df328727184682c048c4c741b384fcddd58
2017-10-20 21:31:59 +02:00
Nika Layzell d7c878d8ac servo: Merge #18941 - Move nsstring from gecko into servo/support/gecko/nsstring (from mystor:nsstring); r=mystor
This is the servo side of bug 1403213.

This cannot merge until https://bugzilla.mozilla.org/show_bug.cgi?id=1377351 merges. It is currently on inbound. This will break autoland when it merges until the gecko-side part has also landed.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7e0f5afa83d9f0eba07988735e56f47a2c18b451

--HG--
rename : servo/components/style/gecko_bindings/nsstring_vendor/src/lib.rs => servo/support/gecko/nsstring/src/lib.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ee57178ea85a844d5fb5c15e9aab3d430c0ac9a1
2017-10-20 12:32:05 -05:00
Xidorn Quan cb1db82909 servo: Merge #18753 - Only generate structs file for the current build (from upsuper:binding-structs); r=emilio
This PR changes build_gecko.rs to only generate the `structs.rs` for the current build (rather than both), depending on whether `gecko_debug` feature is set.

The in-tree files are switched to use the previous release one, because that's what we currently use for stylo test and it is in general what we really care about. For this change, `gecko_debug` mode is removed from Servo CI (in `build-geckolib`) with the assumption that people general do that build locally for stylo development, so it is less likely to be broken than release.

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

--HG--
rename : servo/components/style/gecko/generated/structs_release.rs => servo/components/style/gecko/generated/structs.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d06ba7f9e4d7dfc0b4c688531baa9445a6d4e863
2017-10-05 11:24:22 -05:00
Josh Matthews 0457c494e3 servo: Merge #18414 - Reduce the size of AnimationValue code (from jdm:animdecl-codesize); r=SimonSapin
According to bloaty, these commits shave off 25k from code in the animated_properties module.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 043d0f8e4c0a485cb0729b46301258f8a8af329c
2017-10-03 11:25:28 -05:00
Manish Goregaokar 5617e0da7b servo: Merge #18334 - Add fallible hashmaps from HashGlobe for stylo (from Manishearth:hashglobe); r=emilio,Gankro
HashGlobe code is r=emilio,Gankro

integration code is r=emilio from https://bugzilla.mozilla.org/show_bug.cgi?id=1393656

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : cfe64a9acc5c8dbb187af4eae03510c18bdbe9c4
2017-09-01 16:09:53 -05:00
Clément DAVID 14926dcf7c servo: Merge #18179 - Automatically verify that derive() lists are alphabetically ordered #… (from davidcl:master); r=jdm
<!-- Please describe your changes on the following line: -->
Automatically verify that derive() lists are alphabetically ordered #18172

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

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

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 474369618965569407d127b1e8c481e757cc59d3

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 421aa68def8e17f70580477a4203494db3b69382
2017-08-23 17:18:31 -05:00
est31 87ed7a909b servo: Merge #17067 - Bring back clipboard support (from est31:master); r=jdm
Brings back clipboard support.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #17065
- [x] These changes fix #12805

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
- [x] Testing these chances would require a full integration-style test suite, which servo currently lacks.

Source-Repo: https://github.com/servo/servo
Source-Revision: 12de6165321fe5c066d91bca73eea81c542e5994

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : a706c0e2471171d6f6781af0a3596472553885cb
2017-06-01 10:07:16 -07:00
Simon Sapin e46e47b554 servo: Merge #16915 - Shrink selectors::Component, implement attr selector (in)case-sensitivity (from servo:attr-selectors); r=nox,emilio
* https://bugzilla.mozilla.org/show_bug.cgi?id=1364148
* https://bugzilla.mozilla.org/show_bug.cgi?id=1364162
* https://bugzilla.mozilla.org/show_bug.cgi?id=1363531
* Fixes #3322

Source-Repo: https://github.com/servo/servo
Source-Revision: 640b16634f2828bad46ab6d78e785dfc2025ab46

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4a43dcd2e56b875856847024cf6fdd62b60a01a7
2017-05-18 18:45:20 -05:00
Nathan Froyd 5248783910 servo: Merge #16303 - bump required rayon version to 0.7 (from froydnj:rayon-version-bump); r=jdm
...and bring jpeg-decoder along for the ride.  Minor tweaks were necessary because of rayon API changes.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5141549e2d1236f5d11df90f69de7463813e6a70
2017-05-08 21:36:48 -05:00
Nick Fitzgerald 7783990c45 servo: Merge #16392 - Update the style crate's bindgen dependency to 0.24.0 (from fitzgen:update-bindgen-dependency); r=emilio
<!-- Please describe your changes on the following line: -->

Update style's dependency on bindgen from 0.22 to 0.23

This introduces a huge mess of transitive dependency versioning issues with `bitflags`, which I'm going to just ignore for now. Will file a follow up issue to address them properly.

r? @emilio

---
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because bindgen has its own tests, including building stylo's bindings now.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 81f273b66f3af5cd814ef34c2754121d59547de6

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 046a4c45f3e47212625bbdb70fe340c64f846ec0
2017-05-08 12:19:59 -05:00
Xidorn Quan c88b2a9b34 servo: Merge #16762 - Generate atom files at build-time (from upsuper:buildtime-pseudo); r=emilio
The commits here basically do the following things:
1. move all generated files for gecko into "gecko/generated" so that we can copy all of them around
2. make regen_atoms.py generate file to the out dir rather than in-tree
3. make the build script invoke regen_atoms.py when bindgen feature is enabled

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

--HG--
rename : servo/components/style/gecko_string_cache/atom_macro.rs => servo/components/style/gecko/generated/atom_macro.rs
rename : servo/components/style/gecko_bindings/bindings.rs => servo/components/style/gecko/generated/bindings.rs
rename : servo/components/style/gecko/generated/gecko_pseudo_element_helper.rs => servo/components/style/gecko/generated/pseudo_element_helper.rs
rename : servo/components/style/gecko_bindings/structs_debug.rs => servo/components/style/gecko/generated/structs_debug.rs
rename : servo/components/style/gecko_bindings/structs_release.rs => servo/components/style/gecko/generated/structs_release.rs
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 8635b39ccdefe6d7e8ad306857d3441512755248
2017-05-08 07:35:19 -05:00
Maxwell Borden a826223c85 servo: Merge #16729 - Updating rust-openssl version to 0.9.11 (from Tacklebox:issue16708); r=cbrewster
<!-- Please describe your changes on the following line: -->
Updated dependency rust-openssl to version 0.9.11 as suggested in issue 16708 to resolve compatibility issues with redhat openssl-devel

---
<!-- 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
- [ ] `./mach test-tidy` does not report any errors - it reports duplicate bitflags dependancies
- [X] These changes fix #16708 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because no code was changed.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- 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: 896f0c49b299197eff6101ee434b4feceeb77c4d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0cfdf4d8524ebfb10c2682d9a3f8803e56c97425
2017-05-04 15:53:48 -05:00
Emilio Cobos Álvarez 657aeacf6f servo: Merge #16177 - Bug 1350140: stylo: Implement all the remaining state pseudo-classes (from emilio:stylo-pseudo-classes); r=heycam,jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d98e3406a5acacfd5a203ede54f3df9b7c2a9a0

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 9f6a0e279e17e9a9d2fb499f376096e8cb50d9a4
2017-03-29 08:48:12 -05:00
Guillaume Gomez 633defb386 servo: Merge #15865 - Update audio-video-metadata crate to last version (from servo:audio-video-update); r=nox
Source-Repo: https://github.com/servo/servo
Source-Revision: a6c5a37a56cf2ec0d304f35164271b98e355ea79

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 85e4989a37a9be7b92cf1d7b690a494fca3bb1ad
2017-03-08 03:52:09 -08:00
Anthony Ramine d31d90deef servo: Merge #15798 - Switch to our own websocket fork (from nox:websocket); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: dabbdaf971c14e7b79704bc6d473ef351a3a9192

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 82e61ccf9015896aaf0c2cfe22edb5d52ed94c84
2017-03-02 07:41:20 -08:00
Matt Brubeck 560863b7ed servo: Merge #15774 - Remove tidy exceptions for serde and syn (from mbrubeck:tidy); r=nox
r? @nox

Source-Repo: https://github.com/servo/servo
Source-Revision: 79028427304b1ca3df8fe391de98ab4fcd34087e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0ec96cf248748cccb91a3b20fe0bdb4cf9b32225
2017-02-28 16:32:42 -08:00
Anthony Ramine 12f49cb702 servo: Merge #15670 - Kill the plugins crate and its clippy support (from nox:die-plugins-die); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: 14bbe9d8729dece2d80bb651bca1c2eda13d0429

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e37e34fddb2107725548a4af0b2bb1ba21d5d70e
2017-02-21 05:15:15 -08:00
Anthony Ramine b20ac2cefb servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 7f3a75fa804c0be67f1567ca4a2449cebefa9616

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ee100538644baf6bfc695351c42ab95295d7264f
2017-02-18 12:10:26 -08:00
Simon Sapin e2bc006e7f servo: Merge #15614 - Update ws. This removes some duplicated crates (from servo:what’s_up); r=Ms2ger
<!-- 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
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] 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: 08cb09b2a09aa153454b137c4e9ea2ec82dc3cf8

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 35772ca177431cc1e8f011f3ef559af1435074da
2017-02-17 01:01:39 -08:00
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