Commit Graph

8 Commits

Author SHA1 Message Date
Bastien Orivel
f38039247d servo: Merge #20465 - Bump env_logger to 0.5 and log to 0.4 in every servo crate (from Eijebong:log); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 12d82fe621947c2b29b12d9c9e9a81b0f4baa117
2018-03-28 15:08:52 -04:00
Matt
e509025167 servo: Merge #20328 - Re-expose webrender debugger feature in components/servo (from Moggers:enable-debugger); r=jdm
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
```
Checking files for tidiness...
./Cargo.lock:1: duplicate versions for package `base64`
	The following packages depend on version 0.3.1 from 'crates.io':
		webrender
	The following packages depend on version 0.6.0 from 'crates.io':
		hyper
		net
		script
		webdriver_server
./Cargo.lock:1: duplicate versions for package `bytes`
	The following packages depend on version 0.3.0 from 'crates.io':
		ws
	The following packages depend on version 0.4.6 from 'crates.io':
		ws
./Cargo.lock:1: duplicate versions for package `ws`
	The following packages depend on version 0.6.0 from 'crates.io':
		debugger
	The following packages depend on version 0.7.3 from 'crates.io':
		webrender
./Cargo.lock:1: duplicate versions for package `image`
	The following packages depend on version 0.17.0 from 'crates.io':
		webrender
	The following packages depend on version 0.18.0 from 'crates.io':
		compositing
		net_traits
		script
		webdriver_server
```

What should I do about this?

- [x] These changes fix #20324  (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because: Not sure actually, do I need to write integration tests to make sure it builds with the feature enabled?

<!-- 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: e9fdcdc78584d0e7928ab132f4e2b2fd6fa95547
2018-03-19 17:46:42 -04:00
Anthony Ramine
0fe16c6f53 servo: Merge #16013 - Enable the debugger on Android (from nox:mio); r=larsbergstrom
Apparently mio 0.6.5 now fully supports Android.

Source-Repo: https://github.com/servo/servo
Source-Revision: c2f4a59474692c5e75a388d1c47a2ca0e069bac0
2017-03-17 08:36:27 -07:00
Anthony Ramine
b6f8e5ab2b servo: Merge #15743 - Update ws to 0.6 (from nox:ws); r=emilio
This is exactly the same as 0.5.4, but without a semver violation.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ab1ef887c70a398db1f64486cb09c01e01f9e2c
2017-02-26 06:26:05 -08:00
Alan Jeffrey
965a687125 servo: Merge #14592 - Remove the util crate (from asajeffrey:util-goodbye); r=mbrubeck
<!-- Please describe your changes on the following line: -->

This PR removes the `util` crate.

* Replaced the `spawn_named` and `clamp` functions by appropriate uses of `std:🧵:Builder::spawn`, `std::cmp::min` and `std::cmp::max`.
* Moved `opts`, `prefs` and `resource_files` into a new `config` crate.
* Moved `remutex` and `geometry` into their own crates.

---
<!-- 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 do not require tests because they are refactorings

<!-- 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: 4eb653817f87e5fb47de34356f558eb76ecbca9f
2016-12-14 16:48:42 -08:00
Lars Bergstrom
2147a218cc servo: Merge #14270 - Disable the debugger on Android until mio works on Android (from larsbergstrom:disable_android_debugger); r=nox
<!-- Please describe your changes on the following line: -->
r? @nox

The recent change to `ws-rs` introduced a dependency on `mio`, which depends on `nix`, which does not build on Android (https://github.com/nix-rust/nix/issues/313). I've disabled the debugger in this change.

Fixes #14171

cc @mmatyas

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./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: 9c6f6ebf3e789c251f34d865a4a713988ba81cdb
2016-11-18 23:40:20 -06:00
Eddy Bruel
e2eceeb4bf 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
Eddy Bruel
a93e34fa26 servo: Merge #13204 - Implement a WebSocket server for debugging (from ejpbruel:debugger); r=jdm
<!-- Please describe your changes on the following line: -->

This pull request adds a very simple WebSocket server to Servo, that we intend to use for debugging. It currently only echoes back messages, but eventually we want this server to implement the Chrome Debugging Protocol.

---
<!-- 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 this is a prototype.

<!-- 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: f834c893c7cfde631e458564499d85e8895b4482
2016-09-12 10:19:17 -05:00