Skip to content

Commit a92cb96

Browse files
authored
Merge pull request #1006 from JasonLG1979/bump-deps
Bump dependencies
2 parents 5568c70 + c03d3ad commit a92cb96

7 files changed

Lines changed: 64 additions & 50 deletions

File tree

Cargo.lock

Lines changed: 53 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ version = "0.4.0"
5050

5151
[dependencies]
5252
base64 = "0.13"
53-
env_logger = {version = "0.8", default-features = false, features = ["termcolor","humantime","atty"]}
53+
env_logger = {version = "0.9", default-features = false, features = ["termcolor","humantime","atty"]}
5454
futures-util = { version = "0.3", default_features = false }
5555
getopts = "0.2.21"
5656
hex = "0.4"
5757
hyper = "0.14"
5858
log = "0.4"
59-
rpassword = "5.0"
59+
rpassword = "6.0"
6060
thiserror = "1.0"
6161
tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "signal", "sync", "process"] }
6262
url = "2.2"

core/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ num-integer = "0.1"
3131
num-traits = "0.2"
3232
once_cell = "1.5.2"
3333
pbkdf2 = { version = "0.8", default-features = false, features = ["hmac"] }
34-
priority-queue = "1.1"
34+
priority-queue = "1.2"
3535
protobuf = "2.14.0"
3636
rand = "0.8"
3737
serde = { version = "1.0", features = ["derive"] }
@@ -41,14 +41,14 @@ shannon = "0.2.0"
4141
thiserror = "1.0.7"
4242
tokio = { version = "1.0", features = ["io-util", "net", "rt", "sync"] }
4343
tokio-stream = "0.1.1"
44-
tokio-util = { version = "0.6", features = ["codec"] }
44+
tokio-util = { version = "0.7", features = ["codec"] }
4545
url = "2.1"
46-
uuid = { version = "0.8", default-features = false, features = ["v4"] }
46+
uuid = { version = "1.0", default-features = false, features = ["v4"] }
4747

4848
[build-dependencies]
4949
rand = "0.8"
5050
vergen = "3.0.4"
5151

5252
[dev-dependencies]
53-
env_logger = "0.8"
53+
env_logger = "0.9"
5454
tokio = {version = "1.0", features = ["macros"] }

core/src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub struct SessionConfig {
1212

1313
impl Default for SessionConfig {
1414
fn default() -> SessionConfig {
15-
let device_id = uuid::Uuid::new_v4().to_hyphenated().to_string();
15+
let device_id = uuid::Uuid::new_v4().as_hyphenated().to_string();
1616
SessionConfig {
1717
user_agent: crate::version::VERSION_STRING.to_string(),
1818
device_id,

discovery/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ version = "0.4.0"
3232
[dev-dependencies]
3333
futures = "0.3"
3434
hex = "0.4"
35-
simple_logger = "1.11"
35+
simple_logger = "2.1"
3636
tokio = { version = "1.0", features = ["macros", "rt"] }
3737

3838
[features]

playback/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ version = "0.4.0"
2121
futures-executor = "0.3"
2222
futures-util = { version = "0.3", default_features = false, features = ["alloc"] }
2323
log = "0.4"
24-
parking_lot = { version = "0.11", features = ["deadlock_detection"] }
24+
parking_lot = { version = "0.12", features = ["deadlock_detection"] }
2525
byteorder = "1.4"
2626
shell-words = "1.0.0"
2727
tokio = { version = "1", features = ["sync", "parking_lot"] }
28-
zerocopy = { version = "0.3" }
28+
zerocopy = { version = "0.6" }
2929
thiserror = { version = "1" }
3030

3131
# Backends

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ fn get_setup() -> Setup {
10531053
Some(creds) if username == creds.username => Some(creds),
10541054
_ => {
10551055
let prompt = &format!("Password for {}: ", username);
1056-
match rpassword::prompt_password_stderr(prompt) {
1056+
match rpassword::prompt_password(prompt) {
10571057
Ok(password) => {
10581058
if !password.is_empty() {
10591059
Some(Credentials::with_password(username, password))

0 commit comments

Comments
 (0)