typosquat: move to top level module

rust-lang · Nov 14, 2023 · c176ab6 · c176ab6
1 parent 9baa7d6
commit c176ab6
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 10 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -60,6 +60,7 @@ pub mod sql;
 pub mod ssh;
 pub mod storage;
 mod test_util;
+pub mod typosquat;
 pub mod util;
 pub mod views;
 pub mod worker;

diff --git a/src/worker/typosquat/cache.rs → src/typosquat/cache.rs b/src/worker/typosquat/cache.rs → src/typosquat/cache.rs
diff --git a/src/worker/typosquat/config.rs → src/typosquat/config.rs b/src/worker/typosquat/config.rs → src/typosquat/config.rs
diff --git a/src/worker/typosquat/database.rs → src/typosquat/database.rs b/src/worker/typosquat/database.rs → src/typosquat/database.rs
@@ -161,7 +161,7 @@ impl From<crate::models::Owner> for Owner {
 
 #[cfg(test)]
 mod tests {
-    use crate::{test_util::pg_connection, worker::typosquat::test_util::Faker};
+    use crate::{test_util::pg_connection, typosquat::test_util::Faker};
     use thiserror::Error;
 
     use super::*;

diff --git a/src/worker/typosquat/mod.rs → src/typosquat/mod.rs b/src/worker/typosquat/mod.rs → src/typosquat/mod.rs
diff --git a/src/worker/typosquat/test_util.rs → src/typosquat/test_util.rs b/src/worker/typosquat/test_util.rs → src/typosquat/test_util.rs
diff --git a/src/worker/environment.rs b/src/worker/environment.rs
@@ -2,6 +2,7 @@ use crate::cloudfront::CloudFront;
 use crate::db::DieselPool;
 use crate::fastly::Fastly;
 use crate::storage::Storage;
+use crate::typosquat;
 use crate::Emails;
 use crates_io_index::{Repository, RepositoryConfig};
 use diesel::PgConnection;
@@ -10,8 +11,6 @@ use std::ops::{Deref, DerefMut};
 use std::sync::{Arc, OnceLock};
 use std::time::Instant;
 
-use super::typosquat;
-
 pub struct Environment {
     repository_config: RepositoryConfig,
     repository: Mutex<Option<Repository>>,

diff --git a/src/worker/jobs/typosquat.rs b/src/worker/jobs/typosquat.rs
@@ -4,11 +4,8 @@ use diesel::PgConnection;
 use typomania::Package;
 
 use crate::{
-    worker::{
-        swirl::BackgroundJob,
-        typosquat::{Cache, Crate},
-        Environment,
-    },
+    typosquat::{Cache, Crate},
+    worker::{swirl::BackgroundJob, Environment},
     Emails,
 };
 
@@ -67,7 +64,7 @@ fn check(
 
 #[cfg(test)]
 mod tests {
-    use crate::{test_util::pg_connection, worker::typosquat::test_util::Faker};
+    use crate::{test_util::pg_connection, typosquat::test_util::Faker};
 
     use super::*;
 

diff --git a/src/worker/mod.rs b/src/worker/mod.rs
@@ -11,7 +11,6 @@ use std::sync::Arc;
 mod environment;
 pub mod jobs;
 pub mod swirl;
-mod typosquat;
 
 pub use self::environment::Environment;