Commit Graph

40 Commits

Author SHA1 Message Date
Anthony Ramine
c30a83618c servo: Merge #15588 - Update serde to 0.9 (from servo:serde); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 7f3a75fa804c0be67f1567ca4a2449cebefa9616
2017-02-18 12:10:26 -08:00
UK992
a6ebcb8483 servo: Merge #13205 - Tidy: Fix ordering use statements with braces (from UK992:tidy-sort); r=Wafflespeanut
This hack fixes https://github.com/servo/servo/issues/7412 and matches behavior with rustfmt.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3117787fd2a8b7748cfde1e9b8c5be3c00f2c599
2016-09-08 22:19:19 -05:00
Anthony Ramine
6bb66d30be servo: Merge #12828 - Update serde to 0.8 (fixes #12659) (from nox:serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 9abe9e450b54ef9151bbee1aa0bd2dedb685fa7a
2016-08-12 12:23:10 -05:00
Manish Goregaokar
54ee4f239e servo: Merge #11462 - devtools: fix segfault, remove println (from Manishearth:devtools-fixes); r=Ms2ger
This fixes the segfault from #11457 by adding an autocompartment.

It also removes the print statements which clog the command line and replaces
them with `debug!()`

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because we don't have full-server
  devtools tests

<!-- 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: 3ab5c075595f6bffe3062e26d91f4837fedbf19c
2016-05-27 08:49:43 -05:00
Anthony Ramine
62c6170608 servo: Merge #10285 - Use serde in devtools (from nox:devtools-serde); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 3c00aff5468e8ac1bc88b9fc01aa6091f9552d95
2016-03-31 18:06:13 +05:00
Anthony Ramine
42502a00d2 servo: Merge #10158 - Allow Firefox to be able to connect to devtools again (from nox:devtools); r=Ms2ger
This doesn't fix the performance tab, but at least lets Firefox initialise the devtools window.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5faab270c6babaaa5ee6b75fecf537e7a648d752
2016-03-24 15:18:23 +05:00
Florian Strübe
2a24d60ca1 servo: Merge #9351 - Removed unused imports from devtools crate (from fstr:9343-unused-imports); r=nox
Patch for #9343

Source-Repo: https://github.com/servo/servo
Source-Revision: eb7b9309dd4dabb5ffc5e792af8cd0cfc6ad0435
2016-01-18 07:18:03 +05:00
Ravi Shankar
62e8ea2732 servo: Merge #7698 - sorted the declarations in various files (from Wafflespeanut:sorting); r=frewsxcv
This is a direct extract from my abandoned PR for a lint (#7546), along with some rather clumsy modifications (only on `components/script/dom/mod.rs` and `components/style/lib.rs`), because I had to sort some of the files again to make peace with tidy, which hasn't been educated about sorting yet!

Source-Repo: https://github.com/servo/servo
Source-Revision: a7208869f2903e36f9b2f540b55b50283d7df466
2015-09-23 15:02:56 -06:00
Brandon Fairchild
704178a0dd servo: Merge #7662 - Check for multiple import blocks separated by whitespace (from nerith:import); r=frewsxcv
Fixes #7381.

Source-Repo: https://github.com/servo/servo
Source-Revision: a0d3c9223f09757124b1520c4f17e94fa8bbe249
2015-09-19 13:34:51 -06:00
Ms2ger
ed5eeef2af servo: Merge #7515 - Lint devtools (from Ms2ger:devtools-lint); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: b1b8258a87cf4db69039057124057b0906186d43
2015-09-02 12:32:44 -06:00
Eli Friedman
db7d2cfa76 servo: Merge #7488 - Simplify reflection usage in Actor code (from eefriedman:reflect-gate); r=jdm
The fixed version is shorter, and doesn't use unstable features.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7e8b8293b051ba787e7717b6bf42655f4ee26f1a
2015-08-31 22:24:08 -06:00
Johann Tuffe
25ce9ab4be servo: Merge #7265 - Add alphabetical order check for use statements (from tafia:tidy-use); r=Ms2ger
close #7112

Source-Repo: https://github.com/servo/servo
Source-Revision: a5fbb2f2a6fa79755f975feff2435abb6a5dd0e9
2015-08-20 07:43:56 -06:00
Fabrice Desré
30e10ac321 servo: Merge #7119 - Tentative fix for issue #7110 (from fabricedesre:devtools); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: a35360aa31983aad45bdae634c80a24682cb8318
2015-08-13 21:05:34 -06:00
Harrison G
be26ea3e85 servo: Merge #7101 - Allows object evaluation in devtools -- Closes #6724 (from HarryLovesCode:master); r=jdm
The purpose of this is to fix how objects were previously evaluated in
the developer tools.

- Before this, evaluating an object such as the `window` would `panic!`
- After this, evaluating an object such as the `window` outputs `[object
  Window]`

A few things to note:

- This commit contains `unsafe` code.
- This does not contain a test because the developer tools cannot be properly tested until #5971 lands.

Source-Repo: https://github.com/servo/servo
Source-Revision: f77973c903a3e08067feed3ba39cff3c6bf8ac11
2015-08-09 18:27:53 -06:00
Patrick Walton
e83405fec0 servo: Merge #6745 - devtools: Convert the developer tools to run over IPC (from pcwalton:devtools-ipc); r=jdm
This was a large, invasive change.

r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 4bc1db3fe85f2a1a04536f0f6045b53b1319f4bc
2015-07-27 11:09:38 -06:00
Josh Matthews
060f8b5657 servo: Merge #6540 - Make devtools usable once more (from jdm:devtoolsfix); r=glennw
This fixes the panic by rebasing #6189, and also makes cached messages appear once more.

Source-Repo: https://github.com/servo/servo
Source-Revision: c04b7bbf6e5efe2e5217b69c9680e4e91bbd6ecd
2015-07-07 09:43:36 -06:00
Manish Goregaokar
c574d8a190 servo: Merge #6314 - Audit and reduce usage of unstable features (from Manishearth:feature_audit); r=mbrubeck
Will post audit report in a bit

Source-Repo: https://github.com/servo/servo
Source-Revision: 88c1cdc9fca6568d1075ea9577ac996c5f73b98f
2015-06-09 14:31:42 -06:00
Tamir Duberstein
0c2bb56905 servo: Merge #6168 - Implemented GetCachedMessages (from tamird:get-cached-messages); r=jdm
Rebase of #4175, closes #4175. r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 8759d42559bc5c10f8d90903f33f75bddf44d9fe
2015-05-26 10:34:03 -05:00
Corey Farwell
3d43073796 servo: Merge #6174 - Reduce max line length from 150 to 120 characters (from frewsxcv:cleanup-long-lines); r=SimonSapin
Part of https://github.com/servo/servo/issues/6041

Source-Repo: https://github.com/servo/servo
Source-Revision: 542519ebfd073662bc9421ac5fa0aa01ebc0d6fe
2015-05-24 18:27:26 -05:00
Ms2ger
30431efd3c servo: Merge #6044 - Various cleanup (from Ms2ger:cleanup); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 7bda431e61d06113306c3f12d9f4240a58a7d34d
2015-05-14 07:16:42 -05:00
Simon Sapin
b72bb5e7d5 servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger
r? everybody

Source-Repo: https://github.com/servo/servo
Source-Revision: 49aed6555dbc008c1a378c5cbb303f5467232b6b
2015-05-05 09:11:30 -05:00
Josh Matthews
eb750f9db4 servo: Merge #5536 - Remove int/uint from devtools/devtools_traits (from jdm:devtools_uint); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: 48ee05620d4a063f6b7c3668e1aec38c68999aae
2015-04-07 08:20:36 -05:00
Ms2ger
5bb28e44e9 servo: Merge #5356 - Move devtools to std::net (fixes #5355) (from servo:devtools); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 06d3fc719c58c8a798f8a8fc827ac47385b61c40
2015-03-25 09:03:51 -06:00
Corey Farwell
24e484fec3 servo: Merge #5311 - Make Actor::handle_message take &str instead of &String (from frewsxcv:handle-message-str); r=jdm
Fixes #5305

Source-Repo: https://github.com/servo/servo
Source-Revision: f62ab247fcb9e5fb7025dfdaa83f4ebd4084eab1
2015-03-23 14:42:50 -06:00
Ms2ger
761d1d93b7 servo: Merge #5303 - Update some code that's feature-gated under core (from Ms2ger:core); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 43f3f6c897916aea75773f74060ec84a338834d0
2015-03-21 12:57:46 -06:00
Ms2ger
03f803ab84 servo: Merge #4947 - Use rustc-serialize rather than the built-in deprecated serialize (from Ms2ger:serialize); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: afb152a8569953f730df564be2745c5a6302bf6f
2015-02-17 07:30:50 -07:00
Ruud van Asseldonk
02a3afe5ec servo: Merge #4925 - Remove glob re-exports in devtools_traits/lib.rs (from ruuda:devtools-traits); r=jdm
This resolves #4921.

Source-Repo: https://github.com/servo/servo
Source-Revision: 40eff84ae1220c3d596cddf4fb789763b71bcb38
2015-02-13 09:06:53 -07:00
Simon Sapin
8fbd363d52 servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
Ready for review.

Final link step on android fails, but we know how to fix it and will add it to this branch soon.

Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9
2015-02-11 17:24:45 -07:00
Ms2ger
f3a69a15a3 servo: Merge #4886 - Import msg as msg rather than servo_msg (from Ms2ger:servo_msg); r=saneyuki
Source-Repo: https://github.com/servo/servo
Source-Revision: 29d3b872de4abb693b75e71fc0b987c52b0fd1f6
2015-02-10 03:51:46 -07:00
Manish Goregaokar
f43b3f0b84 servo: Merge #4739 - Fix some warnings (from Manishearth:warning-patrol); r=Ms2ger
Source-Repo: https://github.com/servo/servo
Source-Revision: d373f8dc26239310dec8d2fd66ed72385548cf6f
2015-01-28 02:27:50 -07:00
Josh Matthews
b11f7d94dc servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Ms2ger
b3c7f9d2ca servo: Merge #4554 - Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19 (from servo:rustup_20141221); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 1d7148c79f9124779a910fd5291c5fa0543b2dae
2015-01-08 08:00:57 -07:00
Ms2ger
03365eb590 servo: Merge #4535 - Stop using some obsolete features (from servo:pre-rustup_20141221); r=jdm
This prepares for the rust upgrade currently being conducted.

Source-Repo: https://github.com/servo/servo
Source-Revision: e8fac3681b690adb0796b2a807ac95bd9c13597a
2015-01-03 14:39:46 -07:00
Glenn Watson
636d338cf6 servo: Merge #4405 - Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d (from servo:rustup_20141124); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: fbf42c951b2f53d91e2f32f8035484a07ea83493
2014-12-17 18:45:49 -07:00
Eduard Burtescu
00fee8ee48 servo: Merge #4220 - devtools: handle script task panics gracefully in ConsoleActor (from eddyb:devtools-panic); r=jdm
r? @jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: b8444f96f82791d7bbac456dfe23b71b2b09fea3
2014-12-04 18:04:06 -07:00
Sagar Muchhal
bd27cf8b8b servo: Merge #4213 - Support for Separated Read Write (from jdm:sepreadwrite); r=jdm
Rebased from #4211.

Source-Repo: https://github.com/servo/servo
Source-Revision: 28a132a8f412faa4b15c98939839083836c67052
2014-12-03 22:48:59 -07:00
Glenn Watson
71f726977a servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00
thiagopnts
a754ab00ea servo: Merge #3955 - Move code related to json packet reading to JsonPacketSender trait (from thiagopnts:devtools-refactoring); r=jdm
I was messing around devtools code and saw some TODOs, is anyone working on it? I took one of them:

```// TODO: this really belongs in the protocol module.```

I would be glad to help with this if no one is on it already, just let me know.

Source-Repo: https://github.com/servo/servo
Source-Revision: 88ff8c61f075e6f8b6123b810f1be4acf444b3d1
2014-11-12 14:42:35 -07:00
Simon Sapin
b3423c8393 servo: Merge #3487 - Upgrade Rust and enable style crate rustdoc (from servo:rustup-20140923); r=Ms2ger
The biggest language change is that enum variants now also reserve (for future use) a name in the type namespace, which must not collide with other types. Some things were renamed, and others qualified as `module::name`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7409685589c550ee7a9f94182f511acddab4c6fd
2014-09-29 10:45:27 -06:00
Josh Matthews
468a8a5fa0 servo: Merge #3172 - Dump initial prototype of devtools server into the build. Expect lies if (from jdm:devtools)
Source-Repo: https://github.com/servo/servo
Source-Revision: b82c0dced08ccda8c3c7f35643c3891bc45b058c
2014-09-19 09:15:03 -04:00