From 5931631d76fb8e9fe9f2f7772b8828a6ca6fc9d5 Mon Sep 17 00:00:00 2001
From: RumovZ <gp5glkw78@relay.firefox.com>
Date: Thu, 15 Apr 2021 20:07:16 +0200
Subject: [PATCH] Remove some imports in decks which are in prelude

---
 rslib/src/decks/counts.rs   |  4 +---
 rslib/src/decks/filtered.rs |  2 +-
 rslib/src/decks/schema11.rs |  5 ++---
 rslib/src/decks/tree.rs     | 12 ++----------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/rslib/src/decks/counts.rs b/rslib/src/decks/counts.rs
index 436107b34..5507e33fd 100644
--- a/rslib/src/decks/counts.rs
+++ b/rslib/src/decks/counts.rs
@@ -1,8 +1,6 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
-use crate::{
-    backend_proto as pb, collection::Collection, decks::DeckId, error::Result, prelude::*,
-};
+use crate::{backend_proto as pb, prelude::*};
 use std::collections::HashMap;
 
 #[derive(Debug)]
diff --git a/rslib/src/decks/filtered.rs b/rslib/src/decks/filtered.rs
index 88498aae8..84c065dca 100644
--- a/rslib/src/decks/filtered.rs
+++ b/rslib/src/decks/filtered.rs
@@ -3,7 +3,7 @@
 
 use strum::IntoEnumIterator;
 
-use super::{DeckCommon, DeckKind, FilteredDeck, FilteredSearchOrder, FilteredSearchTerm};
+use super::{DeckCommon, FilteredDeck, FilteredSearchOrder, FilteredSearchTerm};
 use crate::prelude::*;
 
 impl Deck {
diff --git a/rslib/src/decks/schema11.rs b/rslib/src/decks/schema11.rs
index 2b86630a6..bf08625b0 100644
--- a/rslib/src/decks/schema11.rs
+++ b/rslib/src/decks/schema11.rs
@@ -3,13 +3,12 @@
 
 use super::DeckId;
 use super::{
-    human_deck_name_to_native, native_deck_name_to_human, Deck, DeckCommon, DeckKind, FilteredDeck,
+    human_deck_name_to_native, native_deck_name_to_human, DeckCommon, FilteredDeck,
     FilteredSearchTerm, NormalDeck,
 };
 use crate::{
+    prelude::*,
     serde::{default_on_invalid, deserialize_bool_from_anything, deserialize_number_from_string},
-    timestamp::TimestampSecs,
-    types::Usn,
 };
 
 use serde_derive::{Deserialize, Serialize};
diff --git a/rslib/src/decks/tree.rs b/rslib/src/decks/tree.rs
index d4fa199e6..4c580819c 100644
--- a/rslib/src/decks/tree.rs
+++ b/rslib/src/decks/tree.rs
@@ -1,18 +1,10 @@
 // Copyright: Ankitects Pty Ltd and contributors
 // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 
-use super::{Deck, DeckKind, DueCounts};
+use super::DueCounts;
 pub use crate::backend_proto::set_deck_collapsed_in::Scope as DeckCollapseScope;
 use crate::{
-    backend_proto::DeckTreeNode,
-    collection::Collection,
-    config::{BoolKey, SchedulerVersion},
-    deckconf::{DeckConf, DeckConfId},
-    decks::DeckId,
-    error::Result,
-    ops::OpOutput,
-    timestamp::TimestampSecs,
-    undo::Op,
+    backend_proto::DeckTreeNode, config::SchedulerVersion, ops::OpOutput, prelude::*, undo::Op,
 };
 use serde_tuple::Serialize_tuple;
 use std::{