extension traits: Use extend::ext

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/apitest/at-otter.rs b/apitest/at-otter.rs
index f02c21465cab0bc39b610b86776c98b39129a5e5..ea98584bdc2b789a2d8e533569a0b9d321f2a517 100644 (file)
--- a/apitest/at-otter.rs
+++ b/apitest/at-otter.rs
@@ -35,8 +35,11 @@ mod scraper_ext {
   use scraper::*;
   use scraper::html::{*, Html};
 
-  pub trait HtmlExt {
-    fn select<'a,'b>(&'a self, selector: &'b Selector) -> Select<'a, 'b>;
+  #[ext(pub)]
+  impl Html {
+    fn select<'a,'b>(&'a self, selector: &'b Selector) -> Select<'a, 'b> {
+      self.select(selector)
+    }
 
     #[throws(as Option)]
     fn element<S>(&self, sel: S) -> ElementRef
@@ -59,12 +62,6 @@ mod scraper_ext {
     }
   }
 
-  impl HtmlExt for Html {
-    fn select<'a,'b>(&'a self, selector: &'b Selector) -> Select<'a, 'b> {
-      self.select(selector)
-    }
-  }
-
   #[throws(AE)]
   pub fn parse_html(resp: reqwest::blocking::Response) -> Html {
     assert_eq!(resp.status(), 200);

diff --git a/src/imports.rs b/src/imports.rs
index cbe0c9672df95e4e267b5d628ead2877675db2ab..797824db0522aca485efd68d4a203391cb99ab9c 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -12,6 +12,7 @@ pub use chrono_tz;
 pub use delegate;
 pub use either;
 pub use env_logger;
+pub use extend;
 pub use failure;
 pub use flexi_logger;
 pub use fs2;

diff --git a/src/prelude.rs b/src/prelude.rs
index 53c054d448758c2588ac592321078ee78f2f6c63..ed86ff6f71c4fbee54f02e0c820cd9eecef05bc2 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -58,6 +58,7 @@ pub use downcast_rs::{impl_downcast, Downcast};
 pub use either::{Either, Left, Right};
 pub use enum_dispatch::enum_dispatch;
 pub use enum_map::{Enum, EnumMap};
+pub use extend::ext;
 pub use fehler::{throw, throws};
 pub use flexi_logger::LogSpecification;
 pub use fs2::FileExt;