Add some more clippy lints (#2586)

* Add some more clippy lints

* restore config

* no allow dirty

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>

diff --git a/.drone.yml b/.drone.yml
index aa9d6d3cb23707b09607b74d4f8b9267980e9efc..34116b569277af210b3d075f08295feddd1b54b6 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,10 +32,12 @@ steps:
       - rustup component add clippy
       - cargo clippy --workspace --tests --all-targets --all-features -- 
           -D warnings -D deprecated -D clippy::perf -D clippy::complexity 
+          -D clippy::style -D clippy::correctness -D clippy::suspicious
           -D clippy::dbg_macro -D clippy::inefficient_to_string 
           -D clippy::items-after-statements -D clippy::implicit_clone 
           -D clippy::wildcard_imports -D clippy::cast_lossless 
-          -D clippy::manual_string_new -D clippy::redundant_closure_for_method_calls
+          -D clippy::manual_string_new -D clippy::redundant_closure_for_method_calls 
+          -D clippy::unused_self
       - cargo clippy --workspace --all-features -- -D clippy::unwrap_used
 
   - name: cargo test

diff --git a/Cargo.toml b/Cargo.toml
index 0bca1e64e26d59b7b4198e128ab826fa06349c42..67e85b27b36e068e6aa8c6dded291b8ba5e190e7 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,6 +5,7 @@ description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
 homepage = "https://join-lemmy.org/"
 documentation = "https://join-lemmy.org/docs/en/index.html"
+repository = "https://github.com/LemmyNet/lemmy"
 
 [package]
 name = "lemmy_server"
@@ -14,6 +15,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 doctest = false

diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
index 73f3375051ecdf97f6c2cfd0012e03c853ce5fcf..b707545b69e739fd0f58e138493bbe4642025a52 100644 (file)
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 name = "lemmy_api"

diff --git a/crates/api_common/Cargo.toml b/crates/api_common/Cargo.toml
index 9b34e63abf55516efe43a93c3338b52be7b2d9fa..bfbaa8e2577987e5acf56952e2622365b2b1089b 100644 (file)
--- a/crates/api_common/Cargo.toml
+++ b/crates/api_common/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 name = "lemmy_api_common"

diff --git a/crates/api_crud/Cargo.toml b/crates/api_crud/Cargo.toml
index d37f3d0222f416bcc2f1eafc6de8f309867df0b4..b4f68a8df789c89f27975105506401a7cd1a4982 100644 (file)
--- a/crates/api_crud/Cargo.toml
+++ b/crates/api_crud/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [dependencies]
 lemmy_apub = { workspace = true }

diff --git a/crates/apub/Cargo.toml b/crates/apub/Cargo.toml
index 9cb70bf427b57d2fca776d7ccf60ea1c989d0bb4..c2a8827eb09f97d0ce13f45aa67c77819f572909 100644 (file)
--- a/crates/apub/Cargo.toml
+++ b/crates/apub/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 name = "lemmy_apub"

diff --git a/crates/apub/src/http/person.rs b/crates/apub/src/http/person.rs
index 1653697bec1b3390d5abc1b264684fdf224af6e7..0ca31bd5cca1b5016b8e7eaee135dd041632b2f8 100644 (file)
--- a/crates/apub/src/http/person.rs
+++ b/crates/apub/src/http/person.rs
@@ -58,6 +58,6 @@ pub(crate) async fn get_apub_person_outbox(
 ) -> Result<HttpResponse, LemmyError> {
   let person = Person::read_from_name(context.pool(), &info.user_name, false).await?;
   let outbox_id = generate_outbox_url(&person.actor_id)?.into();
-  let outbox = EmptyOutbox::new(outbox_id).await?;
+  let outbox = EmptyOutbox::new(outbox_id)?;
   Ok(create_apub_response(&outbox))
 }

diff --git a/crates/apub/src/http/site.rs b/crates/apub/src/http/site.rs
index 28eef88a97996b4c38c77ca1709491971b220595..201fc5b3a597e22b5c14df85dd9a57ba0b97ffed 100644 (file)
--- a/crates/apub/src/http/site.rs
+++ b/crates/apub/src/http/site.rs
@@ -28,7 +28,7 @@ pub(crate) async fn get_apub_site_outbox(
     "{}/site_outbox",
     context.settings().get_protocol_and_hostname()
   );
-  let outbox = EmptyOutbox::new(Url::parse(&outbox_id)?).await?;
+  let outbox = EmptyOutbox::new(Url::parse(&outbox_id)?)?;
   Ok(create_apub_response(&outbox))
 }
 

diff --git a/crates/apub/src/protocol/collections/empty_outbox.rs b/crates/apub/src/protocol/collections/empty_outbox.rs
index 8c9cf06ed4ff6c32419fcc7e1355005f35db8b2e..b4731f31232a14047e7d74e53fa09dac5599acd3 100644 (file)
--- a/crates/apub/src/protocol/collections/empty_outbox.rs
+++ b/crates/apub/src/protocol/collections/empty_outbox.rs
@@ -14,7 +14,7 @@ pub(crate) struct EmptyOutbox {
 }
 
 impl EmptyOutbox {
-  pub(crate) async fn new(outbox_id: Url) -> Result<EmptyOutbox, LemmyError> {
+  pub(crate) fn new(outbox_id: Url) -> Result<EmptyOutbox, LemmyError> {
     Ok(EmptyOutbox {
       r#type: OrderedCollectionType::OrderedCollection,
       id: outbox_id,

diff --git a/crates/db_schema/Cargo.toml b/crates/db_schema/Cargo.toml
index 90ee264f8255f704d220f26ddc915e4d671d52bb..d996e2ac7766f11a0e213682684c7fa623333751 100644 (file)
--- a/crates/db_schema/Cargo.toml
+++ b/crates/db_schema/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 name = "lemmy_db_schema"

diff --git a/crates/db_views/Cargo.toml b/crates/db_views/Cargo.toml
index 765418ce430e9ed065e75b0c6464ed84b163ef60..41968f3190ffb66d6be1c741cbfcab9020137f0b 100644 (file)
--- a/crates/db_views/Cargo.toml
+++ b/crates/db_views/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 doctest = false

diff --git a/crates/db_views_actor/Cargo.toml b/crates/db_views_actor/Cargo.toml
index 9bea467489f5ae4b1d2b230c0acc45999cd51b47..abec875bdbb70877181c69b381cef19d24ce40d6 100644 (file)
--- a/crates/db_views_actor/Cargo.toml
+++ b/crates/db_views_actor/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 doctest = false

diff --git a/crates/db_views_moderator/Cargo.toml b/crates/db_views_moderator/Cargo.toml
index b953b726138c9445f367f781a29a9d00a0288d91..ad0bf167f62c22501c2520ba2066b50858435c45 100644 (file)
--- a/crates/db_views_moderator/Cargo.toml
+++ b/crates/db_views_moderator/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 doctest = false

diff --git a/crates/routes/Cargo.toml b/crates/routes/Cargo.toml
index 5a732fd5b3afe1bf357319ab9b53858992b5675f..cbcd259c0b7647d11e51312af1eeb91bb04049ae 100644 (file)
--- a/crates/routes/Cargo.toml
+++ b/crates/routes/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 doctest = false

diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index f1a09ae402fb2aed69c5b6f1fd59f1e5b9ee8d58..21f92b117a55bcbbab719364592bf6a68041d042 100644 (file)
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 name = "lemmy_utils"

diff --git a/crates/websocket/Cargo.toml b/crates/websocket/Cargo.toml
index 0d36bca4e3217fcc995b394f8e2cc115a529d61d..829b759afd0410b93a5131f4117db0596d5624fb 100644 (file)
--- a/crates/websocket/Cargo.toml
+++ b/crates/websocket/Cargo.toml
@@ -6,6 +6,7 @@ description.workspace = true
 license.workspace = true
 homepage.workspace = true
 documentation.workspace = true
+repository.workspace = true
 
 [lib]
 name = "lemmy_websocket"

diff --git a/crates/websocket/src/routes.rs b/crates/websocket/src/routes.rs
index 6f6f07562818e8d69ceca7eac9020566a8d4f4d3..a3b1b0460168a6cb1d118f505448616a1cd56816 100644 (file)
--- a/crates/websocket/src/routes.rs
+++ b/crates/websocket/src/routes.rs
@@ -54,7 +54,7 @@ impl Actor for WsSession {
   /// We register ws session with ChatServer
   fn started(&mut self, ctx: &mut Self::Context) {
     // we'll start heartbeat process on session start.
-    self.hb(ctx);
+    WsSession::hb(ctx);
 
     // register self in chat server. `AsyncContext::wait` register
     // future within context, but context waits until this future resolves
@@ -159,7 +159,7 @@ impl WsSession {
   /// helper method that sends ping to client every second.
   ///
   /// also this method checks heartbeats from client
-  fn hb(&self, ctx: &mut ws::WebsocketContext<Self>) {
+  fn hb(ctx: &mut ws::WebsocketContext<Self>) {
     ctx.run_interval(HEARTBEAT_INTERVAL, |act, ctx| {
       // check client heartbeats
       if Instant::now().duration_since(act.hb) > CLIENT_TIMEOUT {

diff --git a/scripts/fix-clippy.sh b/scripts/fix-clippy.sh
index 3ad68bcd6dd13ca69d8e62948ebef99b52a0fa18..53b4c75625a5b2a3168a506f1ad3b23408fe28de 100755 (executable)
--- a/scripts/fix-clippy.sh
+++ b/scripts/fix-clippy.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 set -e
 
-cargo clippy --workspace --fix --allow-dirty --tests --all-targets --all-features -- \
+cargo clippy --workspace --fix --allow-staged --tests --all-targets --all-features -- \
     -D warnings -D deprecated -D clippy::perf -D clippy::complexity \
+    -D clippy::style -D clippy::correctness -D clippy::suspicious \
     -D clippy::dbg_macro -D clippy::inefficient_to_string \
     -D clippy::items-after-statements -D clippy::implicit_clone \
     -D clippy::wildcard_imports -D clippy::cast_lossless \
-    -D clippy::manual_string_new -D clippy::redundant_closure_for_method_calls
+    -D clippy::manual_string_new -D clippy::redundant_closure_for_method_calls \
+    -D clippy::unused_self