Run cargo +stable fix --edition-idioms

Author: jtgeibel

src/models/category.rs

@@ -61,11 +61,11 @@ pub struct CrateCategory {
 }
 
 impl Category {
-    pub fn with_slug(slug: &str) -> WithSlug {
+    pub fn with_slug(slug: &str) -> WithSlug<'_> {
         categories::slug.eq(crate::lower(slug))
     }
 
-    pub fn by_slug(slug: &str) -> BySlug {
+    pub fn by_slug(slug: &str) -> BySlug<'_> {
         Category::all().filter(Self::with_slug(slug))
     }
 

src/models/team.rs

@@ -118,7 +118,7 @@ impl Team {
         // "sanitization"
         fn whitelist(c: char) -> bool {
             match c {
-                'a'...'z' | 'A'...'Z' | '0'...'9' | '-' | '_' => false,
+                'a'..='z' | 'A'..='Z' | '0'..='9' | '-' | '_' => false,
                 _ => true,
             }
         }

src/tests/all.rs

@@ -240,7 +240,7 @@ fn add_team_to_crate(t: &Team, krate: &Crate, u: &User, conn: &PgConnection) ->
     Ok(())
 }
 
-fn sign_in_as(req: &mut Request, user: &User) {
+fn sign_in_as(req: &mut dyn Request, user: &User) {
     req.mut_extensions().insert(user.clone());
     req.mut_extensions()
         .insert(AuthenticationSource::SessionCookie);
@@ -271,6 +271,6 @@ fn new_category<'a>(category: &'a str, slug: &'a str, description: &'a str) -> N
     }
 }
 
-fn logout(req: &mut Request) {
+fn logout(req: &mut dyn Request) {
     req.mut_extensions().pop::<User>();
 }

src/tests/builders.rs

@@ -358,15 +358,15 @@ impl PublishBuilder {
             .zip(&mut slices)
             .map(|(&(name, _), data)| {
                 let len = data.len() as u64;
-                (name, data as &mut Read, len)
+                (name, data as &mut dyn Read, len)
             })
             .collect::<Vec<_>>();
 
         self.files_with_io(&mut files)
     }
 
     /// Set the tarball from a Read trait object
-    pub fn files_with_io(mut self, files: &mut [(&str, &mut Read, u64)]) -> Self {
+    pub fn files_with_io(mut self, files: &mut [(&str, &mut dyn Read, u64)]) -> Self {
         let mut tarball = Vec::new();
         {
             let mut ar = tar::Builder::new(GzEncoder::new(&mut tarball, Compression::default()));

src/tests/record.rs

@@ -150,7 +150,8 @@ impl hyper::service::Service for Proxy {
     type ReqBody = hyper::Body;
     type ResBody = hyper::Body;
     type Error = hyper::Error;
-    type Future = Box<Future<Item = hyper::Response<Self::ResBody>, Error = Self::Error> + Send>;
+    type Future =
+        Box<dyn Future<Item = hyper::Response<Self::ResBody>, Error = Self::Error> + Send>;
 
     fn call(&mut self, req: hyper::Request<Self::ReqBody>) -> Self::Future {
         let record2 = self.record.clone();
@@ -175,7 +176,7 @@ impl hyper::service::NewService for Proxy {
     type ResBody = hyper::Body;
     type Error = hyper::Error;
     type Service = Proxy;
-    type Future = Box<Future<Item = Self::Service, Error = Self::InitError> + Send>;
+    type Future = Box<dyn Future<Item = Self::Service, Error = Self::InitError> + Send>;
     type InitError = hyper::Error;
 
     fn new_service(&self) -> Self::Future {
@@ -209,7 +210,7 @@ type Client = hyper::Client<hyper_tls::HttpsConnector<hyper::client::HttpConnect
 fn record_http(
     req: hyper::Request<hyper::Body>,
     client: &Client,
-) -> Box<Future<Item = (hyper::Response<hyper::Body>, Exchange), Error = hyper::Error> + Send> {
+) -> Box<dyn Future<Item = (hyper::Response<hyper::Body>, Exchange), Error = hyper::Error> + Send> {
     let (header_parts, body) = req.into_parts();
     let method = header_parts.method;
     let uri = header_parts.uri;
@@ -266,8 +267,8 @@ fn record_http(
 fn replay_http(
     req: hyper::Request<hyper::Body>,
     mut exchange: Exchange,
-    stdout: &mut Write,
-) -> Box<Future<Item = hyper::Response<hyper::Body>, Error = hyper::Error> + Send> {
+    stdout: &mut dyn Write,
+) -> Box<dyn Future<Item = hyper::Response<hyper::Body>, Error = hyper::Error> + Send> {
     static IGNORED_HEADERS: &[&str] = &["authorization", "date", "user-agent"];
 
     assert_eq!(req.uri().to_string(), exchange.request.uri);

src/tests/util.rs

@@ -323,13 +323,13 @@ pub struct Bad {
 
 pub type DieselConnection =
     diesel::r2d2::PooledConnection<diesel::r2d2::ConnectionManager<diesel::PgConnection>>;
-type ResponseResult = Result<conduit::Response, Box<std::error::Error + Send>>;
+type ResponseResult = Result<conduit::Response, Box<dyn std::error::Error + Send>>;
 
 /// A type providing helper methods for working with responses
 #[must_use]
 pub struct Response<T> {
     response: conduit::Response,
-    callback_on_good: Option<Box<Fn(&T)>>,
+    callback_on_good: Option<Box<dyn Fn(&T)>>,
 }
 
 impl<T> Response<T>
@@ -343,7 +343,7 @@ where
         }
     }
 
-    fn with_callback(self, callback_on_good: Box<Fn(&T)>) -> Self {
+    fn with_callback(self, callback_on_good: Box<dyn Fn(&T)>) -> Self {
         Self {
             response: self.response,
             callback_on_good: Some(callback_on_good),