Tweak cargo privacy settings.

hammond-data/src/database.rs

@@ -37,7 +37,7 @@ lazy_static! {
     static ref DB_PATH: PathBuf = TEMPDIR.path().join("hammond.db");
 }
 
-pub fn connection() -> Pool {
+pub(crate) fn connection() -> Pool {
     Arc::clone(&POOL)
 }
 
@@ -57,7 +57,7 @@ fn init_pool(db_path: &str) -> Pool {
     pool
 }
 
-pub fn run_migration_on(connection: &SqliteConnection) -> Result<()> {
+fn run_migration_on(connection: &SqliteConnection) -> Result<()> {
     info!("Running DB Migrations...");
     // embedded_migrations::run(connection)?;
     embedded_migrations::run_with_output(connection, &mut io::stdout())?;
@@ -66,6 +66,7 @@ pub fn run_migration_on(connection: &SqliteConnection) -> Result<()> {
 
 // Reset the database into a clean state.
 // Test share a Temp file db.
+#[allow(dead_code)]
 pub fn truncate_db() -> Result<()> {
     let db = connection();
     let con = db.get()?;

hammond-data/src/dbqueries.rs

@@ -1,6 +1,6 @@
 use diesel::prelude::*;
 use diesel;
-use models::{Episode, Podcast, Source};
+use models::queryables::{Episode, Podcast, Source};
 use chrono::prelude::*;
 use errors::*;
 

hammond-data/src/feed.rs

@@ -7,7 +7,8 @@ use rss;
 use dbqueries;
 use parser;
 
-use models::{Episode, NewEpisode, NewPodcast, Podcast, Source};
+use models::queryables::{Episode, Podcast, Source};
+use models::insertables::{NewEpisode, NewPodcast};
 use database::connection;
 use errors::*;
 

hammond-data/src/lib.rs

@@ -29,12 +29,12 @@ pub mod dbqueries;
 pub mod utils;
 pub mod feed;
 pub mod errors;
-pub mod database;
-mod models;
+pub(crate) mod database;
+pub(crate) mod models;
 mod parser;
 mod schema;
 
-pub use models::{Episode, Podcast, Source};
+pub use models::queryables::{Episode, Podcast, Source};
 
 pub mod xdg_ {
     use std::path::PathBuf;

hammond-data/src/models/insertables.rs

@@ -1,7 +1,7 @@
 use diesel::prelude::*;
 
 use schema::{episode, podcast, source};
-use models::{Episode, Podcast, Source};
+use models::queryables::{Episode, Podcast, Source};
 
 use utils::url_cleaner;
 use errors::*;
@@ -21,7 +21,7 @@ trait Update {
 #[derive(Insertable)]
 #[table_name = "source"]
 #[derive(Debug, Clone)]
-pub struct NewSource {
+pub(crate) struct NewSource {
     uri: String,
     last_modified: Option<String>,
     http_etag: Option<String>,
@@ -64,7 +64,7 @@ impl NewSource {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "episode"]
 #[derive(Debug, Clone, Default)]
-pub struct NewEpisode {
+pub(crate) struct NewEpisode {
     pub title: Option<String>,
     pub uri: String,
     pub description: Option<String>,
@@ -127,7 +127,7 @@ impl NewEpisode {
 #[derive(Insertable, AsChangeset)]
 #[table_name = "podcast"]
 #[derive(Debug, Clone)]
-pub struct NewPodcast {
+pub(crate) struct NewPodcast {
     pub title: String,
     pub link: String,
     pub description: String,

hammond-data/src/models/mod.rs

@@ -1,6 +1,2 @@
-mod insertables;
-mod queryables;
-
-// Re-export the structs so the API doesn't change and brake everything else.
-pub use self::queryables::{Episode, Podcast, Source};
-pub use self::insertables::{NewEpisode, NewPodcast, NewSource};
+pub(crate) mod insertables;
+pub(crate) mod queryables;

hammond-data/src/parser.rs

@@ -1,14 +1,14 @@
 use rss::{Channel, Item};
 use rfc822_sanitizer::parse_from_rfc2822_with_fallback;
 
-use models::{NewEpisode, NewPodcast};
+use models::insertables::{NewEpisode, NewPodcast};
 use utils::url_cleaner;
 
 use errors::*;
 
 // TODO: Extend the support for parsing itunes extensions
 /// Parses a `rss::Channel` into a `NewPodcast` Struct.
-pub fn new_podcast(chan: &Channel, source_id: i32) -> NewPodcast {
+pub(crate) fn new_podcast(chan: &Channel, source_id: i32) -> NewPodcast {
     let title = chan.title().trim().to_owned();
     let description = chan.description().trim().to_owned();
 
@@ -30,7 +30,7 @@ pub fn new_podcast(chan: &Channel, source_id: i32) -> NewPodcast {
 }
 
 /// Parses an `rss::Item` into a `NewEpisode` Struct.
-pub fn new_episode(item: &Item, parent_id: i32) -> Result<NewEpisode> {
+pub(crate) fn new_episode(item: &Item, parent_id: i32) -> Result<NewEpisode> {
     let title = item.title().map(|s| s.trim().to_owned());
     let description = item.description().map(|s| s.trim().to_owned());
     let guid = item.guid().map(|s| s.value().trim().to_owned());

hammond-data/src/utils.rs

@@ -5,7 +5,7 @@ use url::{Position, Url};
 
 use errors::*;
 use dbqueries;
-use models::Episode;
+use models::queryables::Episode;
 
 use std::path::Path;
 use std::fs;