From: Dessalines Date: Sun, 16 Aug 2020 15:27:50 +0000 (-0400) Subject: Fix community_view clippy X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/%7Bthis.imageSrc.unwrap%28%29%7D?a=commitdiff_plain;h=abadc79756495aedbe4525dd2cfc162d5df5b59a;p=lemmy.git Fix community_view clippy --- diff --git a/ansible/VERSION b/ansible/VERSION index 4d067892..f8cb2549 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 fb8b09a3..2e9a219d 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 14ebccb0..54b0a43b 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 7445cc46..1d47c7d7 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 68b46483..d76db524 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 4ba3c78b..06c52807 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": {