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/layout_traits/lib.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/layout_traits/lib.rs')
| -rw-r--r-- | components/layout_traits/lib.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/components/layout_traits/lib.rs b/components/layout_traits/lib.rs index 9fb431c8e2e..8ecf214fbb0 100644 --- a/components/layout_traits/lib.rs +++ b/components/layout_traits/lib.rs @@ -4,17 +4,6 @@ #![deny(unsafe_code)] -extern crate gfx; -extern crate ipc_channel; -extern crate metrics; -extern crate msg; -extern crate net_traits; -extern crate profile_traits; -extern crate script_traits; -extern crate servo_channel; -extern crate servo_url; -extern crate webrender_api; - // This module contains traits in layout used generically // in the rest of Servo. // The traits are here instead of in layout so @@ -46,7 +35,7 @@ pub trait LayoutThreadFactory { pipeline_port: IpcReceiver<LayoutControlMsg>, constellation_chan: IpcSender<ConstellationMsg>, script_chan: IpcSender<ConstellationControlMsg>, - image_cache: Arc<ImageCache>, + image_cache: Arc<dyn ImageCache>, font_cache_thread: FontCacheThread, time_profiler_chan: time::ProfilerChan, mem_profiler_chan: mem::ProfilerChan, |