From 19e0b7e56594f3cc307cfce6c8d2be13b41a1f51 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Sun, 18 Nov 2018 14:37:08 +0200
Subject: [PATCH] Further preparations for Rusto 2018 edition

---
 podcasts-data/src/dbqueries.rs          | 2 +-
 podcasts-data/src/lib.rs                | 3 ++-
 podcasts-data/src/models/new_episode.rs | 2 +-
 podcasts-data/src/pipeline.rs           | 2 +-
 podcasts-downloader/src/lib.rs          | 1 +
 podcasts-gtk/src/main.rs                | 1 +
 podcasts-gtk/src/widgets/base_view.rs   | 2 +-
 rustfmt.toml                            | 1 +
 8 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/podcasts-data/src/dbqueries.rs b/podcasts-data/src/dbqueries.rs
index a94a92d..234cd1f 100644
--- a/podcasts-data/src/dbqueries.rs
+++ b/podcasts-data/src/dbqueries.rs
@@ -467,8 +467,8 @@ pub fn update_none_to_played_now(parent: &Show) -> Result<usize, DataError> {
 mod tests {
     use super::*;
     use crate::database::*;
-    use failure::Error;
     use crate::pipeline;
+    use failure::Error;
 
     #[test]
     fn test_update_none_to_played_now() -> Result<(), Error> {
diff --git a/podcasts-data/src/lib.rs b/podcasts-data/src/lib.rs
index b6e9402..ae83537 100644
--- a/podcasts-data/src/lib.rs
+++ b/podcasts-data/src/lib.rs
@@ -19,6 +19,7 @@
 
 #![recursion_limit = "1024"]
 #![allow(unknown_lints)]
+#![feature(rust_2018_preview)]
 #![cfg_attr(
     all(test, feature = "clippy"),
     allow(option_unwrap_used, result_unwrap_used)
@@ -43,7 +44,7 @@
 )]
 // Enable lint group collections
 #![warn(nonstandard_style, bad_style, unused)]
-#![allow(edition_2018, rust_2018_idioms)]
+#![warn(edition_2018, rust_2018_idioms)]
 // standalone lints
 #![warn(
     const_err,
diff --git a/podcasts-data/src/models/new_episode.rs b/podcasts-data/src/models/new_episode.rs
index 17db812..6a077ac 100644
--- a/podcasts-data/src/models/new_episode.rs
+++ b/podcasts-data/src/models/new_episode.rs
@@ -332,9 +332,9 @@ impl NewEpisodeMinimal {
 mod tests {
     use crate::database::truncate_db;
     use crate::dbqueries;
-    use failure::Error;
     use crate::models::new_episode::{NewEpisodeMinimal, NewEpisodeMinimalBuilder};
     use crate::models::*;
+    use failure::Error;
 
     use rss::Channel;
 
diff --git a/podcasts-data/src/pipeline.rs b/podcasts-data/src/pipeline.rs
index 1db487a..c3a0271 100644
--- a/podcasts-data/src/pipeline.rs
+++ b/podcasts-data/src/pipeline.rs
@@ -89,8 +89,8 @@ mod tests {
     use super::*;
     use crate::database::truncate_db;
     use crate::dbqueries;
-    use failure::Error;
     use crate::Source;
+    use failure::Error;
 
     // (path, url) tuples.
     const URLS: &[&str] = &[
diff --git a/podcasts-downloader/src/lib.rs b/podcasts-downloader/src/lib.rs
index dba85ce..b3004c0 100644
--- a/podcasts-downloader/src/lib.rs
+++ b/podcasts-downloader/src/lib.rs
@@ -19,6 +19,7 @@
 
 #![recursion_limit = "1024"]
 #![allow(unknown_lints)]
+#![feature(rust_2018_preview)]
 #![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name, option_map_unit_fn))]
 // Enable lint group collections
 #![warn(nonstandard_style, edition_2018, rust_2018_idioms, bad_style, unused)]
diff --git a/podcasts-gtk/src/main.rs b/podcasts-gtk/src/main.rs
index 24dfcbc..ac0c242 100644
--- a/podcasts-gtk/src/main.rs
+++ b/podcasts-gtk/src/main.rs
@@ -27,6 +27,7 @@
     )
 )]
 #![allow(unknown_lints)]
+#![feature(rust_2018_preview)]
 // Enable lint group collections
 #![warn(nonstandard_style, edition_2018, rust_2018_idioms, bad_style, unused)]
 // standalone lints
diff --git a/podcasts-gtk/src/widgets/base_view.rs b/podcasts-gtk/src/widgets/base_view.rs
index 6cff0c9..8adbbb0 100644
--- a/podcasts-gtk/src/widgets/base_view.rs
+++ b/podcasts-gtk/src/widgets/base_view.rs
@@ -17,8 +17,8 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-use gtk::{self, prelude::*, Adjustment, Orientation, PolicyType};
 use crate::utils::smooth_scroll_to;
+use gtk::{self, prelude::*, Adjustment, Orientation, PolicyType};
 
 #[derive(Debug, Clone)]
 pub(crate) struct BaseView {
diff --git a/rustfmt.toml b/rustfmt.toml
index 16bfbd5..ed9dd92 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -4,3 +4,4 @@ newline_style = "Unix"
 format_strings = true
 normalize_comments = true
 use_field_init_shorthand = true
+edition = "2018"