diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-08 05:11:11 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-08 05:11:11 -0500 |
commit | f220a63a0f4d7757c2a5e7c9da1c2063d37bebd6 (patch) | |
tree | b1a3c3010e6c29c4f9d86930f948116b6bf27a93 /components/net/tests/main.rs | |
parent | b1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff) | |
parent | 9f977c52878e3638f475ca9a78e9f57d0d22893d (diff) | |
download | servo-f220a63a0f4d7757c2a5e7c9da1c2063d37bebd6.tar.gz servo-f220a63a0f4d7757c2a5e7c9da1c2063d37bebd6.zip |
Auto merge of #22133 - servo:extern-crate, r=SimonSapin
Use 2018-edition idioms in crates that use that edition
The first commit is almost entirely mechanical, created by running `cargo fix --edition-idioms` and relevant crates. I undid the change of adding an anonymous lifetime parameter in types that have implicit lifetimes parameters, for example replacing `&mut Formatter` with `&mut Formatter<'_>`, because I don’t like it. The remaining changes are, in many places:
* Add `dyn` to trait object types, for example `Rc<gl::Gl>` to `Rc<dyn gl::Gl>`. This change also works in the 2015 edition.
* Remove `extern crate` where is it made unneeded by changes to the import/module system.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22133)
<!-- Reviewable:end -->
Diffstat (limited to 'components/net/tests/main.rs')
-rw-r--r-- | components/net/tests/main.rs | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/components/net/tests/main.rs b/components/net/tests/main.rs index aa7a6aa9cf6..48063adad81 100644 --- a/components/net/tests/main.rs +++ b/components/net/tests/main.rs @@ -4,32 +4,8 @@ #![cfg(test)] -extern crate cookie as cookie_rs; -extern crate devtools_traits; -extern crate embedder_traits; -extern crate flate2; -extern crate futures; -extern crate headers_core; -extern crate headers_ext; -extern crate http; -extern crate hyper; -extern crate hyper_serde; -extern crate ipc_channel; #[macro_use] extern crate lazy_static; -extern crate mime; -extern crate msg; -extern crate net; -extern crate net_traits; -extern crate openssl; -extern crate profile_traits; -extern crate servo_channel; -extern crate servo_config; -extern crate servo_url; -extern crate time; -extern crate tokio; -extern crate tokio_openssl; -extern crate url; mod cookie; mod cookie_http_state; @@ -90,7 +66,7 @@ fn create_embedder_proxy() -> EmbedderProxy { } impl EventLoopWaker for DummyEventLoopWaker { fn wake(&self) {} - fn clone(&self) -> Box<EventLoopWaker + Send> { + fn clone(&self) -> Box<dyn EventLoopWaker + Send> { Box::new(DummyEventLoopWaker {}) } } |