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/script/dom/htmlcollection.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/script/dom/htmlcollection.rs')
-rw-r--r-- | components/script/dom/htmlcollection.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 99d3c4775b8..cc2256a6764 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -69,7 +69,10 @@ pub struct HTMLCollection { impl HTMLCollection { #[allow(unrooted_must_root)] - pub fn new_inherited(root: &Node, filter: Box<CollectionFilter + 'static>) -> HTMLCollection { + pub fn new_inherited( + root: &Node, + filter: Box<dyn CollectionFilter + 'static>, + ) -> HTMLCollection { HTMLCollection { reflector_: Reflector::new(), root: Dom::from_ref(root), @@ -99,7 +102,7 @@ impl HTMLCollection { pub fn new( window: &Window, root: &Node, - filter: Box<CollectionFilter + 'static>, + filter: Box<dyn CollectionFilter + 'static>, ) -> DomRoot<HTMLCollection> { reflect_dom_object( Box::new(HTMLCollection::new_inherited(root, filter)), @@ -111,7 +114,7 @@ impl HTMLCollection { pub fn create( window: &Window, root: &Node, - filter: Box<CollectionFilter + 'static>, + filter: Box<dyn CollectionFilter + 'static>, ) -> DomRoot<HTMLCollection> { HTMLCollection::new(window, root, filter) } |