From abadc79756495aedbe4525dd2cfc162d5df5b59a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 16 Aug 2020 11:27:50 -0400 Subject: [PATCH] Fix community_view clippy --- ansible/VERSION | 2 +- docker/prod/docker-compose.yml | 2 +- docker/travis/docker_push.sh | 4 ++-- server/lemmy_db/src/community_view.rs | 3 ++- server/src/version.rs | 2 +- ui/package.json | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ansible/VERSION b/ansible/VERSION index 4d067892d..f8cb25495 100644 --- a/ansible/VERSION +++ b/ansible/VERSION @@ -1 +1 @@ -v0.7.50 +v0.7.51 diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index fb8b09a32..2e9a219d0 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -12,7 +12,7 @@ services: restart: always lemmy: - image: dessalines/lemmy:v0.7.50 + image: dessalines/lemmy:v0.7.51 ports: - "127.0.0.1:8536:8536" restart: always diff --git a/docker/travis/docker_push.sh b/docker/travis/docker_push.sh index 14ebccb09..54b0a43bf 100644 --- a/docker/travis/docker_push.sh +++ b/docker/travis/docker_push.sh @@ -1,5 +1,5 @@ #!/bin/sh echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker tag dessalines/lemmy:travis \ - dessalines/lemmy:v0.7.50 -docker push dessalines/lemmy:v0.7.50 + dessalines/lemmy:v0.7.51 +docker push dessalines/lemmy:v0.7.51 diff --git a/server/lemmy_db/src/community_view.rs b/server/lemmy_db/src/community_view.rs index 7445cc463..1d47c7d7e 100644 --- a/server/lemmy_db/src/community_view.rs +++ b/server/lemmy_db/src/community_view.rs @@ -245,7 +245,8 @@ impl<'a> CommunityQueryBuilder<'a> { .filter(user_id.is_null()) } }, - SortType::Hot | _ => { + // Covers all other sorts, including hot + _ => { query = query .order_by(hot_rank.desc()) .then_order_by(number_of_subscribers.desc()) diff --git a/server/src/version.rs b/server/src/version.rs index 68b46483d..d76db5248 100644 --- a/server/src/version.rs +++ b/server/src/version.rs @@ -1 +1 @@ -pub const VERSION: &str = "v0.7.50"; +pub const VERSION: &str = "v0.7.51"; diff --git a/ui/package.json b/ui/package.json index 4ba3c78b1..06c52807a 100644 --- a/ui/package.json +++ b/ui/package.json @@ -73,7 +73,7 @@ "engineStrict": true, "husky": { "hooks": { - "pre-commit": "cargo clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged" + "pre-commit": "cargo +nightly clippy --manifest-path ../server/Cargo.toml --all-targets --workspace -- -D warnings && lint-staged" } }, "lint-staged": {