From 52faf5996b5f91b1f6287a6c64d535bda45196f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:37:34 +0000 Subject: [PATCH 1/7] Bump tracing-subscriber from 0.3.7 to 0.3.8 Bumps [tracing-subscriber](https://github.com/tokio-rs/tracing) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-subscriber-0.3.7...tracing-subscriber-0.3.8) --- updated-dependencies: - dependency-name: tracing-subscriber dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d27ef05..d0d97865 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,7 +25,7 @@ dependencies = [ "activitystreams-kinds", "chrono", "mime 0.3.16", - "serde 1.0.133", + "serde 1.0.136", "serde_json", "thiserror", "url 2.2.2", @@ -48,7 +48,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0784e99afd032199d3ed70cefb8eb3a8d1aef15f7f2c4e68d033c4e12bb6079e" dependencies = [ - "serde 1.0.133", + "serde 1.0.136", "url 2.2.2", ] @@ -236,7 +236,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" dependencies = [ - "serde 1.0.133", + "serde 1.0.136", "serde_json", ] @@ -5128,9 +5128,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" +checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" dependencies = [ "ansi_term", "sharded-slab", @@ -5270,7 +5270,7 @@ dependencies = [ "idna 0.2.3", "matches", "percent-encoding 2.1.0", - "serde 1.0.133", + "serde 1.0.136", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 296ac289..8f384c3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ shrinkwraprs = "0.3.0" validator = { version = "0.14", features = ["derive"] } webfinger = "0.4.1" tracing = "0.1.30" -tracing-subscriber = "0.3.5" +tracing-subscriber = "0.3.8" riker = "0.4.2" [[bin]] From 8438d48c71eb3437209398201406cf07e5740f30 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:37:50 +0000 Subject: [PATCH 2/7] Bump ructe from 0.13.4 to 0.14.0 Bumps [ructe](https://github.com/kaj/ructe) from 0.13.4 to 0.14.0. - [Release notes](https://github.com/kaj/ructe/releases) - [Changelog](https://github.com/kaj/ructe/blob/master/CHANGELOG.md) - [Commits](https://github.com/kaj/ructe/compare/v0.13.4...v0.14.0) --- updated-dependencies: - dependency-name: ructe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 63 ++++++------------------------------------------------ Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d27ef05..eac154ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,7 +25,7 @@ dependencies = [ "activitystreams-kinds", "chrono", "mime 0.3.16", - "serde 1.0.133", + "serde 1.0.136", "serde_json", "thiserror", "url 2.2.2", @@ -48,7 +48,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0784e99afd032199d3ed70cefb8eb3a8d1aef15f7f2c4e68d033c4e12bb6079e" dependencies = [ - "serde 1.0.133", + "serde 1.0.136", "url 2.2.2", ] @@ -236,7 +236,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" dependencies = [ - "serde 1.0.133", + "serde 1.0.136", "serde_json", ] @@ -410,18 +410,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -1409,12 +1397,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "futf" version = "0.1.4" @@ -2715,19 +2697,6 @@ dependencies = [ "version_check 0.9.4", ] -[[package]] -name = "nom" -version = "6.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" -dependencies = [ - "bitvec", - "funty", - "lexical-core", - "memchr", - "version_check 0.9.4", -] - [[package]] name = "nom" version = "7.1.0" @@ -3461,12 +3430,6 @@ dependencies = [ "scheduled-thread-pool", ] -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "rand" version = "0.4.6" @@ -3987,15 +3950,15 @@ dependencies = [ [[package]] name = "ructe" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fd2f3b927021cc8586d365c36d16d82d91fdae0a3839819c12c8e86e0f929e" +checksum = "ef88d8c2492d7266e264b31e0ffcf1149d5ba183bccd3abaf1483ee905fc85de" dependencies = [ "base64 0.13.0", "bytecount", "itertools 0.10.3", "md5", - "nom 6.2.1", + "nom 7.1.0", ] [[package]] @@ -4600,12 +4563,6 @@ dependencies = [ "combine", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" version = "0.4.38" @@ -5270,7 +5227,7 @@ dependencies = [ "idna 0.2.3", "matches", "percent-encoding 2.1.0", - "serde 1.0.133", + "serde 1.0.136", ] [[package]] @@ -5605,12 +5562,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "xattr" version = "0.2.2" diff --git a/Cargo.toml b/Cargo.toml index 296ac289..8660a183 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ git = "https://github.com/fdb-hiroshima/rocket_csrf" rev = "29910f2829e7e590a540da3804336577b48c7b31" [build-dependencies] -ructe = "0.13.0" +ructe = "0.14.0" rsass = "0.23" [features] From 4205e38605f79a7d48504c3daaeaed428455d6be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:38:02 +0000 Subject: [PATCH 3/7] Bump rsass from 0.23.2 to 0.23.4 Bumps [rsass](https://github.com/kaj/rsass) from 0.23.2 to 0.23.4. - [Release notes](https://github.com/kaj/rsass/releases) - [Changelog](https://github.com/kaj/rsass/blob/master/CHANGELOG.md) - [Commits](https://github.com/kaj/rsass/compare/v0.23.2...v0.23.4) --- updated-dependencies: - dependency-name: rsass dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0d27ef05..8ec3d76f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,7 +25,7 @@ dependencies = [ "activitystreams-kinds", "chrono", "mime 0.3.16", - "serde 1.0.133", + "serde 1.0.136", "serde_json", "thiserror", "url 2.2.2", @@ -48,7 +48,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0784e99afd032199d3ed70cefb8eb3a8d1aef15f7f2c4e68d033c4e12bb6079e" dependencies = [ - "serde 1.0.133", + "serde 1.0.136", "url 2.2.2", ] @@ -236,7 +236,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f1c3703dd33532d7f0ca049168930e9099ecac238e23cf932f3a69c42f06da" dependencies = [ - "serde 1.0.133", + "serde 1.0.136", "serde_json", ] @@ -3971,9 +3971,9 @@ dependencies = [ [[package]] name = "rsass" -version = "0.23.2" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d3d887143c4ffd66335779e475de36320725e486061c011df346638f41ee9a" +checksum = "92bfc58e02cd215730b021f9e6f0f46e0a7e1f75aa558ca7a7492763fbe88df2" dependencies = [ "fastrand", "lazy_static", @@ -5270,7 +5270,7 @@ dependencies = [ "idna 0.2.3", "matches", "percent-encoding 2.1.0", - "serde 1.0.133", + "serde 1.0.136", ] [[package]] From a5003526c82e16b8473abaccd9941e61b53f576b Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Tue, 8 Feb 2022 16:47:48 +0900 Subject: [PATCH 4/7] Follow clippy --- templates/base.rs.html | 2 +- templates/users/header.rs.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/base.rs.html b/templates/base.rs.html index 115ea4e7..564c1f84 100644 --- a/templates/base.rs.html +++ b/templates/base.rs.html @@ -51,7 +51,7 @@ @i18n!(ctx.1, "Log Out") - @avatar(ctx.0, &ctx.2.clone().unwrap(), Size::Small, false, &ctx.1) + @avatar(ctx.0, &ctx.2.clone().unwrap(), Size::Small, false, ctx.1) @i18n!(ctx.1, "My account") } else { diff --git a/templates/users/header.rs.html b/templates/users/header.rs.html index e7f5080e..7e4813b1 100644 --- a/templates/users/header.rs.html +++ b/templates/users/header.rs.html @@ -7,7 +7,7 @@
- @avatar(ctx.0, &user, Size::Medium, false, ctx.1) + @avatar(ctx.0, user, Size::Medium, false, ctx.1)

@user.name() From 28e0cdfe630fb4a670868e5edd0fb77dd7d29419 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Tue, 8 Feb 2022 16:50:00 +0900 Subject: [PATCH 5/7] Remove activitystreams from dependencies --- plume-common/Cargo.toml | 1 - plume-models/Cargo.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 0a1cf12a..ecdc2fee 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -24,7 +24,6 @@ tokio = "0.1.22" regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] } tracing = "0.1.30" askama_escape = "0.10.2" -activitystreams = "0.7.0-alpha.14" [dependencies.chrono] features = ["serde"] diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index ce900298..f430825f 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -35,7 +35,6 @@ riker = "0.4.2" once_cell = "1.5.2" lettre = "0.9.6" native-tls = "0.2.8" -activitystreams = "0.7.0-alpha.14" [dependencies.chrono] features = ["serde"] From 6f68c4504bd227a1e8322504e6605d282846ae4c Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Tue, 8 Feb 2022 16:53:35 +0900 Subject: [PATCH 6/7] Update Cargo.lock --- Cargo.lock | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57767602..0a1d1d26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,21 +16,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "activitystreams" -version = "0.7.0-alpha.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bcc3fbb392890a1942b1e5cca76cba93c8ed24b5ff50004cc3289afaab3f92c" -dependencies = [ - "activitystreams-kinds", - "chrono", - "mime 0.3.16", - "serde 1.0.136", - "serde_json", - "thiserror", - "url 2.2.2", -] - [[package]] name = "activitystreams-derive" version = "0.1.1" @@ -42,16 +27,6 @@ dependencies = [ "syn 0.13.11", ] -[[package]] -name = "activitystreams-kinds" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0784e99afd032199d3ed70cefb8eb3a8d1aef15f7f2c4e68d033c4e12bb6079e" -dependencies = [ - "serde 1.0.136", - "url 2.2.2", -] - [[package]] name = "activitystreams-traits" version = "0.1.0" @@ -3140,7 +3115,6 @@ name = "plume-common" version = "0.7.1" dependencies = [ "activitypub", - "activitystreams", "activitystreams-derive", "activitystreams-traits", "array_tool", @@ -3195,7 +3169,6 @@ name = "plume-models" version = "0.7.1" dependencies = [ "activitypub", - "activitystreams", "ammonia", "assert-json-diff", "bcrypt", @@ -5227,7 +5200,6 @@ dependencies = [ "idna 0.2.3", "matches", "percent-encoding 2.1.0", - "serde 1.0.136", ] [[package]] From 4780472d48c32cc5fe8ba8f454e89962d067e775 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Tue, 8 Feb 2022 16:54:03 +0900 Subject: [PATCH 7/7] Make Circle CI follow ructe change --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0f7e651..cd7f2d06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ commands: type: boolean default: false steps: - - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<> --release -p <> -- -D warnings -A clippy::needless_borrow + - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<> --release -p <> -- -D warnings run_with_coverage: description: run command with environment for coverage