Merge pull request 'Update crates' (#1023) from update-crates into main
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1023
This commit is contained in:
		
						commit
						9662936b44
					
				| @ -63,7 +63,7 @@ commands: | ||||
|         type: boolean | ||||
|         default: false | ||||
|     steps: | ||||
|     - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings -A clippy::needless_borrow | ||||
|     - run: cargo clippy <<^parameters.no_feature>>--no-default-features --features="${FEATURES}"<</parameters.no_feature>> --release -p <<parameters.package>> -- -D warnings | ||||
| 
 | ||||
|   run_with_coverage: | ||||
|     description: run command with environment for coverage | ||||
|  | ||||
							
								
								
									
										93
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										93
									
								
								Cargo.lock
									
									
									
										generated
									
									
									
								
							| @ -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.133", | ||||
|  "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.133", | ||||
|  "url 2.2.2", | ||||
| ] | ||||
| 
 | ||||
| [[package]] | ||||
| name = "activitystreams-traits" | ||||
| version = "0.1.0" | ||||
| @ -236,7 +211,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 +385,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 +1372,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 +2672,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" | ||||
| @ -3171,7 +3115,6 @@ name = "plume-common" | ||||
| version = "0.7.1" | ||||
| dependencies = [ | ||||
|  "activitypub", | ||||
|  "activitystreams", | ||||
|  "activitystreams-derive", | ||||
|  "activitystreams-traits", | ||||
|  "array_tool", | ||||
| @ -3226,7 +3169,6 @@ name = "plume-models" | ||||
| version = "0.7.1" | ||||
| dependencies = [ | ||||
|  "activitypub", | ||||
|  "activitystreams", | ||||
|  "ammonia", | ||||
|  "assert-json-diff", | ||||
|  "bcrypt", | ||||
| @ -3461,12 +3403,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" | ||||
| @ -3971,9 +3907,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", | ||||
| @ -3987,15 +3923,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 +4536,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" | ||||
| @ -5128,9 +5058,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 +5200,6 @@ dependencies = [ | ||||
|  "idna 0.2.3", | ||||
|  "matches", | ||||
|  "percent-encoding 2.1.0", | ||||
|  "serde 1.0.133", | ||||
| ] | ||||
| 
 | ||||
| [[package]] | ||||
| @ -5605,12 +5534,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" | ||||
|  | ||||
| @ -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]] | ||||
| @ -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] | ||||
|  | ||||
| @ -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"] | ||||
|  | ||||
| @ -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"] | ||||
|  | ||||
| @ -51,7 +51,7 @@ | ||||
|                             <span class="mobile-label">@i18n!(ctx.1, "Log Out")</span> | ||||
|                         </a> | ||||
|                         <a href="@uri!(user::me)" title="@i18n!(ctx.1, "My account")"> | ||||
|                             @avatar(ctx.0, &ctx.2.clone().unwrap(), Size::Small, false, &ctx.1) | ||||
|                             @avatar(ctx.0, &ctx.2.clone().unwrap(), Size::Small, false, ctx.1) | ||||
|                             <span class="mobile-label">@i18n!(ctx.1, "My account")</span> | ||||
|                         </a> | ||||
|                     } else { | ||||
|  | ||||
| @ -7,7 +7,7 @@ | ||||
| <div class="h-card"> | ||||
|     <div class="user"> | ||||
|         <div class="flex wrap"> | ||||
|             @avatar(ctx.0, &user, Size::Medium, false, ctx.1) | ||||
|             @avatar(ctx.0, user, Size::Medium, false, ctx.1) | ||||
| 
 | ||||
|             <h1 class="grow flex vertical"> | ||||
|                 <span class="p-name">@user.name()</span> | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user