Browse Source

Fix warning

master
Dylan Baker 8 months ago
parent
commit
07d9d81e3c
2 changed files with 256 additions and 14 deletions
  1. 255
    13
      Cargo.lock
  2. 1
    1
      oslo-lib/src/routes.rs

+ 255
- 13
Cargo.lock View File

@@ -1,5 +1,7 @@
1 1
 # This file is automatically @generated by Cargo.
2 2
 # It is not intended for manual editing.
3
+version = 3
4
+
3 5
 [[package]]
4 6
 name = "addr2line"
5 7
 version = "0.13.0"
@@ -90,6 +92,15 @@ version = "0.3.6"
90 92
 source = "registry+https://github.com/rust-lang/crates.io-index"
91 93
 checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
92 94
 
95
+[[package]]
96
+name = "arrayvec"
97
+version = "0.4.12"
98
+source = "registry+https://github.com/rust-lang/crates.io-index"
99
+checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9"
100
+dependencies = [
101
+ "nodrop",
102
+]
103
+
93 104
 [[package]]
94 105
 name = "arrayvec"
95 106
 version = "0.5.1"
@@ -142,13 +153,13 @@ dependencies = [
142 153
  "anyhow",
143 154
  "async-std",
144 155
  "async-trait",
145
- "base64",
156
+ "base64 0.12.3",
146 157
  "bincode",
147 158
  "blake3",
148 159
  "chrono",
149 160
  "hmac",
150 161
  "kv-log-macro",
151
- "rand",
162
+ "rand 0.7.3",
152 163
  "serde",
153 164
  "serde_json",
154 165
  "sha2",
@@ -189,7 +200,7 @@ checksum = "00d68a33ebc8b57800847d00787307f84a562224a14db069b0acefe4c2abbf5d"
189 200
 dependencies = [
190 201
  "async-attributes",
191 202
  "async-task",
192
- "crossbeam-utils",
203
+ "crossbeam-utils 0.7.2",
193 204
  "futures-channel",
194 205
  "futures-core",
195 206
  "futures-io",
@@ -255,6 +266,15 @@ version = "0.2.6"
255 266
 source = "registry+https://github.com/rust-lang/crates.io-index"
256 267
 checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1"
257 268
 
269
+[[package]]
270
+name = "base64"
271
+version = "0.10.1"
272
+source = "registry+https://github.com/rust-lang/crates.io-index"
273
+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
274
+dependencies = [
275
+ "byteorder",
276
+]
277
+
258 278
 [[package]]
259 279
 name = "base64"
260 280
 version = "0.12.3"
@@ -277,6 +297,16 @@ version = "1.2.1"
277 297
 source = "registry+https://github.com/rust-lang/crates.io-index"
278 298
 checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
279 299
 
300
+[[package]]
301
+name = "blake2-rfc"
302
+version = "0.2.18"
303
+source = "registry+https://github.com/rust-lang/crates.io-index"
304
+checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
305
+dependencies = [
306
+ "arrayvec 0.4.12",
307
+ "constant_time_eq",
308
+]
309
+
280 310
 [[package]]
281 311
 name = "blake3"
282 312
 version = "0.3.6"
@@ -284,7 +314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
284 314
 checksum = "ce4f9586c9a3151c4b49b19e82ba163dd073614dd057e53c969e1a4db5b52720"
285 315
 dependencies = [
286 316
  "arrayref",
287
- "arrayvec",
317
+ "arrayvec 0.5.1",
288 318
  "cc",
289 319
  "cfg-if",
290 320
  "constant_time_eq",
@@ -423,6 +453,15 @@ dependencies = [
423 453
  "parse-zoneinfo",
424 454
 ]
425 455
 
456
+[[package]]
457
+name = "cloudabi"
458
+version = "0.0.3"
459
+source = "registry+https://github.com/rust-lang/crates.io-index"
460
+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
461
+dependencies = [
462
+ "bitflags",
463
+]
464
+
426 465
 [[package]]
427 466
 name = "concurrent-queue"
428 467
 version = "1.2.2"
@@ -445,11 +484,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
445 484
 checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0"
446 485
 dependencies = [
447 486
  "aes-gcm",
448
- "base64",
487
+ "base64 0.12.3",
449 488
  "hkdf",
450 489
  "hmac",
451 490
  "percent-encoding",
452
- "rand",
491
+ "rand 0.7.3",
453 492
  "sha2",
454 493
  "time 0.2.16",
455 494
  "version_check",
@@ -461,6 +500,69 @@ version = "0.1.2"
461 500
 source = "registry+https://github.com/rust-lang/crates.io-index"
462 501
 checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
463 502
 
503
+[[package]]
504
+name = "crossbeam"
505
+version = "0.5.0"
506
+source = "registry+https://github.com/rust-lang/crates.io-index"
507
+checksum = "d1c92ff2d7a202d592f5a412d75cf421495c913817781c1cb383bf12a77e185f"
508
+dependencies = [
509
+ "cfg-if",
510
+ "crossbeam-channel",
511
+ "crossbeam-deque",
512
+ "crossbeam-epoch 0.6.1",
513
+ "crossbeam-utils 0.6.6",
514
+ "lazy_static",
515
+ "num_cpus",
516
+ "parking_lot",
517
+]
518
+
519
+[[package]]
520
+name = "crossbeam-channel"
521
+version = "0.3.9"
522
+source = "registry+https://github.com/rust-lang/crates.io-index"
523
+checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
524
+dependencies = [
525
+ "crossbeam-utils 0.6.6",
526
+]
527
+
528
+[[package]]
529
+name = "crossbeam-deque"
530
+version = "0.6.3"
531
+source = "registry+https://github.com/rust-lang/crates.io-index"
532
+checksum = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
533
+dependencies = [
534
+ "crossbeam-epoch 0.7.2",
535
+ "crossbeam-utils 0.6.6",
536
+]
537
+
538
+[[package]]
539
+name = "crossbeam-epoch"
540
+version = "0.6.1"
541
+source = "registry+https://github.com/rust-lang/crates.io-index"
542
+checksum = "2449aaa4ec7ef96e5fb24db16024b935df718e9ae1cec0a1e68feeca2efca7b8"
543
+dependencies = [
544
+ "arrayvec 0.4.12",
545
+ "cfg-if",
546
+ "crossbeam-utils 0.6.6",
547
+ "lazy_static",
548
+ "memoffset 0.2.1",
549
+ "scopeguard 0.3.3",
550
+]
551
+
552
+[[package]]
553
+name = "crossbeam-epoch"
554
+version = "0.7.2"
555
+source = "registry+https://github.com/rust-lang/crates.io-index"
556
+checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
557
+dependencies = [
558
+ "arrayvec 0.4.12",
559
+ "cfg-if",
560
+ "crossbeam-utils 0.6.6",
561
+ "lazy_static",
562
+ "memoffset 0.5.6",
563
+ "scopeguard 1.1.0",
564
+]
565
+
464 566
 [[package]]
465 567
 name = "crossbeam-queue"
466 568
 version = "0.2.3"
@@ -468,10 +570,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
468 570
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
469 571
 dependencies = [
470 572
  "cfg-if",
471
- "crossbeam-utils",
573
+ "crossbeam-utils 0.7.2",
472 574
  "maybe-uninit",
473 575
 ]
474 576
 
577
+[[package]]
578
+name = "crossbeam-utils"
579
+version = "0.6.6"
580
+source = "registry+https://github.com/rust-lang/crates.io-index"
581
+checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
582
+dependencies = [
583
+ "cfg-if",
584
+ "lazy_static",
585
+]
586
+
475 587
 [[package]]
476 588
 name = "crossbeam-utils"
477 589
 version = "0.7.2"
@@ -591,6 +703,12 @@ version = "1.0.7"
591 703
 source = "registry+https://github.com/rust-lang/crates.io-index"
592 704
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
593 705
 
706
+[[package]]
707
+name = "fuchsia-cprng"
708
+version = "0.1.1"
709
+source = "registry+https://github.com/rust-lang/crates.io-index"
710
+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
711
+
594 712
 [[package]]
595 713
 name = "futures-channel"
596 714
 version = "0.3.5"
@@ -798,7 +916,7 @@ dependencies = [
798 916
  "cookie",
799 917
  "infer",
800 918
  "pin-project-lite",
801
- "rand",
919
+ "rand 0.7.3",
802 920
  "serde",
803 921
  "serde_json",
804 922
  "serde_qs",
@@ -835,7 +953,7 @@ version = "0.4.16"
835 953
 source = "registry+https://github.com/rust-lang/crates.io-index"
836 954
 checksum = "22dcbf2a4a289528dbef21686354904e1c694ac642610a9bff9e7df730d9ec72"
837 955
 dependencies = [
838
- "crossbeam-utils",
956
+ "crossbeam-utils 0.7.2",
839 957
  "globset",
840 958
  "lazy_static",
841 959
  "log",
@@ -889,6 +1007,16 @@ version = "0.2.74"
889 1007
 source = "registry+https://github.com/rust-lang/crates.io-index"
890 1008
 checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10"
891 1009
 
1010
+[[package]]
1011
+name = "lock_api"
1012
+version = "0.1.5"
1013
+source = "registry+https://github.com/rust-lang/crates.io-index"
1014
+checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
1015
+dependencies = [
1016
+ "owning_ref",
1017
+ "scopeguard 0.3.3",
1018
+]
1019
+
892 1020
 [[package]]
893 1021
 name = "log"
894 1022
 version = "0.4.11"
@@ -922,6 +1050,21 @@ version = "2.3.3"
922 1050
 source = "registry+https://github.com/rust-lang/crates.io-index"
923 1051
 checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
924 1052
 
1053
+[[package]]
1054
+name = "memoffset"
1055
+version = "0.2.1"
1056
+source = "registry+https://github.com/rust-lang/crates.io-index"
1057
+checksum = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
1058
+
1059
+[[package]]
1060
+name = "memoffset"
1061
+version = "0.5.6"
1062
+source = "registry+https://github.com/rust-lang/crates.io-index"
1063
+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
1064
+dependencies = [
1065
+ "autocfg",
1066
+]
1067
+
925 1068
 [[package]]
926 1069
 name = "miniz_oxide"
927 1070
 version = "0.4.0"
@@ -931,6 +1074,12 @@ dependencies = [
931 1074
  "adler",
932 1075
 ]
933 1076
 
1077
+[[package]]
1078
+name = "nodrop"
1079
+version = "0.1.14"
1080
+source = "registry+https://github.com/rust-lang/crates.io-index"
1081
+checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
1082
+
934 1083
 [[package]]
935 1084
 name = "num-integer"
936 1085
 version = "0.1.43"
@@ -1008,6 +1157,7 @@ dependencies = [
1008 1157
  "dotenv",
1009 1158
  "lazy_static",
1010 1159
  "pulldown-cmark",
1160
+ "rust-argon2",
1011 1161
  "rust-embed",
1012 1162
  "serde",
1013 1163
  "serde_json",
@@ -1016,12 +1166,44 @@ dependencies = [
1016 1166
  "tide-tera",
1017 1167
 ]
1018 1168
 
1169
+[[package]]
1170
+name = "owning_ref"
1171
+version = "0.4.1"
1172
+source = "registry+https://github.com/rust-lang/crates.io-index"
1173
+checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
1174
+dependencies = [
1175
+ "stable_deref_trait",
1176
+]
1177
+
1019 1178
 [[package]]
1020 1179
 name = "parking"
1021 1180
 version = "1.0.6"
1022 1181
 source = "registry+https://github.com/rust-lang/crates.io-index"
1023 1182
 checksum = "6cb300f271742d4a2a66c01b6b2fa0c83dfebd2e0bf11addb879a3547b4ed87c"
1024 1183
 
1184
+[[package]]
1185
+name = "parking_lot"
1186
+version = "0.6.4"
1187
+source = "registry+https://github.com/rust-lang/crates.io-index"
1188
+checksum = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
1189
+dependencies = [
1190
+ "lock_api",
1191
+ "parking_lot_core",
1192
+]
1193
+
1194
+[[package]]
1195
+name = "parking_lot_core"
1196
+version = "0.3.1"
1197
+source = "registry+https://github.com/rust-lang/crates.io-index"
1198
+checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
1199
+dependencies = [
1200
+ "libc",
1201
+ "rand 0.5.6",
1202
+ "rustc_version",
1203
+ "smallvec",
1204
+ "winapi",
1205
+]
1206
+
1025 1207
 [[package]]
1026 1208
 name = "parse-zoneinfo"
1027 1209
 version = "0.3.0"
@@ -1169,6 +1351,19 @@ dependencies = [
1169 1351
  "proc-macro2",
1170 1352
 ]
1171 1353
 
1354
+[[package]]
1355
+name = "rand"
1356
+version = "0.5.6"
1357
+source = "registry+https://github.com/rust-lang/crates.io-index"
1358
+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
1359
+dependencies = [
1360
+ "cloudabi",
1361
+ "fuchsia-cprng",
1362
+ "libc",
1363
+ "rand_core 0.3.1",
1364
+ "winapi",
1365
+]
1366
+
1172 1367
 [[package]]
1173 1368
 name = "rand"
1174 1369
 version = "0.7.3"
@@ -1178,7 +1373,7 @@ dependencies = [
1178 1373
  "getrandom",
1179 1374
  "libc",
1180 1375
  "rand_chacha",
1181
- "rand_core",
1376
+ "rand_core 0.5.1",
1182 1377
  "rand_hc",
1183 1378
 ]
1184 1379
 
@@ -1189,9 +1384,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1189 1384
 checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
1190 1385
 dependencies = [
1191 1386
  "ppv-lite86",
1192
- "rand_core",
1387
+ "rand_core 0.5.1",
1193 1388
 ]
1194 1389
 
1390
+[[package]]
1391
+name = "rand_core"
1392
+version = "0.3.1"
1393
+source = "registry+https://github.com/rust-lang/crates.io-index"
1394
+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
1395
+dependencies = [
1396
+ "rand_core 0.4.2",
1397
+]
1398
+
1399
+[[package]]
1400
+name = "rand_core"
1401
+version = "0.4.2"
1402
+source = "registry+https://github.com/rust-lang/crates.io-index"
1403
+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
1404
+
1195 1405
 [[package]]
1196 1406
 name = "rand_core"
1197 1407
 version = "0.5.1"
@@ -1207,7 +1417,7 @@ version = "0.2.0"
1207 1417
 source = "registry+https://github.com/rust-lang/crates.io-index"
1208 1418
 checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
1209 1419
 dependencies = [
1210
- "rand_core",
1420
+ "rand_core 0.5.1",
1211 1421
 ]
1212 1422
 
1213 1423
 [[package]]
@@ -1246,6 +1456,17 @@ version = "0.2.0"
1246 1456
 source = "registry+https://github.com/rust-lang/crates.io-index"
1247 1457
 checksum = "56770675ebc04927ded3e60633437841581c285dc6236109ea25fbf3beb7b59e"
1248 1458
 
1459
+[[package]]
1460
+name = "rust-argon2"
1461
+version = "0.4.0"
1462
+source = "registry+https://github.com/rust-lang/crates.io-index"
1463
+checksum = "648ed935b0bc078f4d3e355985be1a8dedd99879ea104837cfc76da7a91f8661"
1464
+dependencies = [
1465
+ "base64 0.10.1",
1466
+ "blake2-rfc",
1467
+ "crossbeam",
1468
+]
1469
+
1249 1470
 [[package]]
1250 1471
 name = "rust-embed"
1251 1472
 version = "5.9.0"
@@ -1321,6 +1542,18 @@ version = "1.0.0"
1321 1542
 source = "registry+https://github.com/rust-lang/crates.io-index"
1322 1543
 checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
1323 1544
 
1545
+[[package]]
1546
+name = "scopeguard"
1547
+version = "0.3.3"
1548
+source = "registry+https://github.com/rust-lang/crates.io-index"
1549
+checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
1550
+
1551
+[[package]]
1552
+name = "scopeguard"
1553
+version = "1.1.0"
1554
+source = "registry+https://github.com/rust-lang/crates.io-index"
1555
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
1556
+
1324 1557
 [[package]]
1325 1558
 name = "semver"
1326 1559
 version = "0.9.0"
@@ -1443,6 +1676,15 @@ dependencies = [
1443 1676
  "deunicode",
1444 1677
 ]
1445 1678
 
1679
+[[package]]
1680
+name = "smallvec"
1681
+version = "0.6.14"
1682
+source = "registry+https://github.com/rust-lang/crates.io-index"
1683
+checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
1684
+dependencies = [
1685
+ "maybe-uninit",
1686
+]
1687
+
1446 1688
 [[package]]
1447 1689
 name = "smol"
1448 1690
 version = "0.1.18"
@@ -1571,7 +1813,7 @@ dependencies = [
1571 1813
  "percent-encoding",
1572 1814
  "pest",
1573 1815
  "pest_derive",
1574
- "rand",
1816
+ "rand 0.7.3",
1575 1817
  "regex",
1576 1818
  "serde",
1577 1819
  "serde_json",

+ 1
- 1
oslo-lib/src/routes.rs View File

@@ -188,7 +188,7 @@ fn prepare_flash_messages(mut req: Request<State>) -> Context {
188 188
         match req.session_mut().get::<String>(key) {
189 189
             Some(value) => {
190 190
                 req.session_mut().remove(key);
191
-                &context.insert(key, &value);
191
+                let _ = &context.insert(key, &value);
192 192
             }
193 193
             None => {}
194 194
         }

Loading…
Cancel
Save