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/context.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/context.rs')
-rw-r--r-- | components/layout/context.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/context.rs b/components/layout/context.rs index 1ab4637cd8a..08530e74a5c 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -64,7 +64,7 @@ pub struct LayoutContext<'a> { pub style_context: SharedStyleContext<'a>, /// Reference to the script thread image cache. - pub image_cache: Arc<ImageCache>, + pub image_cache: Arc<dyn ImageCache>, /// Interface to the font cache thread. pub font_cache_thread: Mutex<FontCacheThread>, @@ -77,7 +77,7 @@ pub struct LayoutContext<'a> { >, /// Paint worklets - pub registered_painters: &'a RegisteredPainters, + pub registered_painters: &'a dyn RegisteredPainters, /// A list of in-progress image loads to be shared with the script thread. /// A None value means that this layout was not initiated by the script thread. @@ -197,5 +197,5 @@ pub trait RegisteredPainter: RegisteredSpeculativePainter + Painter {} /// A set of registered painters pub trait RegisteredPainters: Sync { /// Look up a painter - fn get(&self, name: &Atom) -> Option<&RegisteredPainter>; + fn get(&self, name: &Atom) -> Option<&dyn RegisteredPainter>; } |