aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webgl_extensions/wrapper.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/webgl_extensions/wrapper.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/webgl_extensions/wrapper.rs')
-rw-r--r--components/script/dom/webgl_extensions/wrapper.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/webgl_extensions/wrapper.rs b/components/script/dom/webgl_extensions/wrapper.rs
index 9918952dc73..11c9bac3d7e 100644
--- a/components/script/dom/webgl_extensions/wrapper.rs
+++ b/components/script/dom/webgl_extensions/wrapper.rs
@@ -25,7 +25,7 @@ pub trait WebGLExtensionWrapper: JSTraceable + MallocSizeOf {
fn is_enabled(&self) -> bool;
fn enable(&self, ext: &WebGLExtensions);
fn name(&self) -> &'static str;
- fn as_any(&self) -> &Any;
+ fn as_any(&self) -> &dyn Any;
}
#[must_root]
@@ -85,7 +85,7 @@ where
T::name()
}
- fn as_any<'a>(&'a self) -> &'a Any {
+ fn as_any<'a>(&'a self) -> &'a dyn Any {
self
}
}