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/connector.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/connector.rs')
| -rw-r--r-- | components/net/connector.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/net/connector.rs b/components/net/connector.rs index 38693e70e24..de9f9b2e087 100644 --- a/components/net/connector.rs +++ b/components/net/connector.rs @@ -161,7 +161,7 @@ pub fn create_http_client<E>( executor: E, ) -> Client<Connector, WrappedBody> where - E: Executor<Box<Future<Error = (), Item = ()> + Send + 'static>> + Sync + Send + 'static, + E: Executor<Box<dyn Future<Error = (), Item = ()> + Send + 'static>> + Sync + Send + 'static, { let connector = HttpsConnector::with_connector(HttpConnector::new(), ssl_connector_builder).unwrap(); |