Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-27 08:19:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'veilidchat-work' into 'main'

Browse Source 
cargo lock fix

See merge request veilid/veilid!76
This commit is contained in:
Christien Rioux 2023-07-16 22:01:18 +00:00
commit 12c681806f
3 changed files with 37 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Cargo.lock generated
View File

@ -390,18 +390,6 @@ version = "4.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
[[package]]
name = "async-tls"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7e7fbc0843fc5ad3d5ca889c5b2bea9130984d34cd0e62db57ab70c2529a8e3"
dependencies = [
"futures",
"rustls 0.18.1",
"webpki 0.21.4",
"webpki-roots 0.20.0",
]
[[package]] [[package]]
name = "async-tls" name = "async-tls"
version = "0.11.0" version = "0.11.0"
@ -446,7 +434,6 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c" checksum = "a5c45a0dd44b7e6533ac4e7acc38ead1a3b39885f5bbb738140d30ea528abc7c"
dependencies = [ dependencies = [
"async-tls 0.9.0",
"futures-io", "futures-io",
"futures-util", "futures-util",
"log", "log",
@ -1307,7 +1294,7 @@ dependencies = [
"flexi_logger", "flexi_logger",
"lazy_static", "lazy_static",
"log", "log",
"time 0.3.9", "time 0.3.23",
"unicode-width", "unicode-width",
] ]
@ -1322,7 +1309,7 @@ dependencies = [
[[package]] [[package]]
name = "cursive_buffered_backend" name = "cursive_buffered_backend"
version = "0.6.1" version = "0.6.1-pre"
dependencies = [ dependencies = [
"cursive_core", "cursive_core",
"enumset", "enumset",
@ -1349,7 +1336,7 @@ dependencies = [
"owning_ref", "owning_ref",
"serde_json", "serde_json",
"serde_yaml", "serde_yaml",
"time 0.3.9", "time 0.3.23",
"tokio", "tokio",
"toml 0.7.6", "toml 0.7.6",
"unicode-segmentation", "unicode-segmentation",
@ -1827,7 +1814,7 @@ dependencies = [
"regex", "regex",
"rustversion", "rustversion",
"thiserror", "thiserror",
"time 0.3.9", "time 0.3.23",
] ]
[[package]] [[package]]
@ -3784,9 +3771,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.65" version = "1.0.66"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92de25114670a878b1261c79c9f8f729fb97e95bac93f6312f583c60dd6a1dfe" checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@ -3859,9 +3846,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]] [[package]]
name = "quote" name = "quote"
version = "1.0.30" version = "1.0.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5907a1b7c277254a8b15170f6e7c97cfa60ee7872a3217663bb81151e48184bb" checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
] ]
@ -4182,19 +4169,6 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "rustls"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
dependencies = [
"base64 0.12.3",
"log",
"ring",
"sct 0.6.1",
"webpki 0.21.4",
]
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.19.1" version = "0.19.1"
@ -4675,7 +4649,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
dependencies = [ dependencies = [
"log", "log",
"termcolor", "termcolor",
"time 0.3.9", "time 0.3.23",
] ]
[[package]] [[package]]
@ -5005,16 +4979,24 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.9" version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
dependencies = [ dependencies = [
"itoa", "itoa",
"libc", "libc",
"num_threads", "num_threads",
"time-macros 0.2.4", "serde",
"time-core",
"time-macros 0.2.10",
] ]
[[package]]
name = "time-core"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
[[package]] [[package]]
name = "time-macros" name = "time-macros"
version = "0.1.1" version = "0.1.1"
@ -5027,9 +5009,12 @@ dependencies = [
[[package]] [[package]]
name = "time-macros" name = "time-macros"
version = "0.2.4" version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
dependencies = [
"time-core",
]
[[package]] [[package]]
name = "time-macros-impl" name = "time-macros-impl"
@ -5295,7 +5280,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
dependencies = [ dependencies = [
"crossbeam-channel", "crossbeam-channel",
"time 0.3.9", "time 0.3.23",
"tracing-subscriber", "tracing-subscriber",
] ]
@ -5642,7 +5627,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]] [[package]]
name = "veilid-cli" name = "veilid-cli"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"arboard", "arboard",
"async-std", "async-std",
@ -5678,7 +5663,7 @@ dependencies = [
[[package]] [[package]]
name = "veilid-core" name = "veilid-core"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"argon2", "argon2",
"async-io", "async-io",
@ -5781,7 +5766,7 @@ dependencies = [
[[package]] [[package]]
name = "veilid-flutter" name = "veilid-flutter"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"allo-isolate", "allo-isolate",
"async-std", "async-std",
@ -5810,11 +5795,11 @@ dependencies = [
[[package]] [[package]]
name = "veilid-server" name = "veilid-server"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
"async-std", "async-std",
"async-tungstenite 0.8.0", "async-tungstenite 0.22.2",
"backtrace", "backtrace",
"bugsalot", "bugsalot",
"cfg-if 1.0.0", "cfg-if 1.0.0",
@ -5830,11 +5815,11 @@ dependencies = [
"hostname", "hostname",
"json", "json",
"lazy_static", "lazy_static",
"nix 0.22.3", "nix 0.26.2",
"opentelemetry", "opentelemetry",
"opentelemetry-otlp", "opentelemetry-otlp",
"opentelemetry-semantic-conventions", "opentelemetry-semantic-conventions",
"parking_lot 0.11.2", "parking_lot 0.12.1",
"rpassword", "rpassword",
"serde", "serde",
"serde_derive", "serde_derive",
@ -5860,7 +5845,7 @@ dependencies = [
[[package]] [[package]]
name = "veilid-tools" name = "veilid-tools"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"android-logd-logger", "android-logd-logger",
"async-lock", "async-lock",
@ -5911,7 +5896,7 @@ dependencies = [
[[package]] [[package]]
name = "veilid-wasm" name = "veilid-wasm"
version = "0.1.0" version = "0.1.1"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
"console_error_panic_hook", "console_error_panic_hook",
@ -6127,15 +6112,6 @@ dependencies = [
"untrusted", "untrusted",
] ]
[[package]]
name = "webpki-roots"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
dependencies = [
"webpki 0.21.4",
]
[[package]] [[package]]
name = "webpki-roots" name = "webpki-roots"
version = "0.21.1" version = "0.21.1"

2
external/cursive_buffered_backend vendored

@ -1 +1 @@
Subproject commit 89d84d57e1880f2b0dbc37b44a0289d8c76858bd Subproject commit c4a7301b865d5af525fad30e76c2c5d121189943

2
veilid-flutter/example/pubspec.lock
View File

@ -395,7 +395,7 @@ packages:
path: ".." path: ".."
relative: true relative: true
source: path source: path
version: "0.0.1" version: "0.1.1"
win32: win32:
dependency: transitive dependency: transitive
description: description: