aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/htmlimageelement.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-11-08 05:11:11 -0500
committerGitHub <noreply@github.com>2018-11-08 05:11:11 -0500
commitf220a63a0f4d7757c2a5e7c9da1c2063d37bebd6 (patch)
treeb1a3c3010e6c29c4f9d86930f948116b6bf27a93 /components/script/dom/htmlimageelement.rs
parentb1fd6237d1304f3d57abdafd3e6e738c1ece9f83 (diff)
parent9f977c52878e3638f475ca9a78e9f57d0d22893d (diff)
downloadservo-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/script/dom/htmlimageelement.rs')
-rw-r--r--components/script/dom/htmlimageelement.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 05d1d2804e1..851f9971455 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -157,7 +157,7 @@ impl HTMLImageElement {
/// The context required for asynchronously loading an external image.
struct ImageContext {
/// Reference to the script thread image cache.
- image_cache: Arc<ImageCache>,
+ image_cache: Arc<dyn ImageCache>,
/// Indicates whether the request failed, and why
status: Result<(), NetworkError>,
/// The cache ID for this request.
@@ -229,7 +229,7 @@ impl HTMLImageElement {
/// Update the current image with a valid URL.
fn fetch_image(&self, img_url: &ServoUrl) {
fn add_cache_listener_for_element(
- image_cache: Arc<ImageCache>,
+ image_cache: Arc<dyn ImageCache>,
id: PendingImageId,
elem: &HTMLImageElement,
) {
@@ -979,7 +979,7 @@ impl HTMLImageElement {
fn react_to_environment_changes_sync_steps(&self, generation: u32) {
// TODO reduce duplicacy of this code
fn add_cache_listener_for_element(
- image_cache: Arc<ImageCache>,
+ image_cache: Arc<dyn ImageCache>,
id: PendingImageId,
elem: &HTMLImageElement,
selected_source: String,
@@ -1576,8 +1576,8 @@ impl HTMLImageElementMethods for HTMLImageElement {
}
impl VirtualMethods for HTMLImageElement {
- fn super_type(&self) -> Option<&VirtualMethods> {
- Some(self.upcast::<HTMLElement>() as &VirtualMethods)
+ fn super_type(&self) -> Option<&dyn VirtualMethods> {
+ Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
}
fn adopting_steps(&self, old_doc: &Document) {