summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>2022-04-22 21:38:37 +0100
committerGitHub <noreply@github.com>2022-04-22 21:38:37 +0100
commit89549b367b694ae7a5570d5e50975979aa1bceee (patch)
treee0fd35116761518a7c56553f4916ec2db541e23b
parent831cc98c24feefe259585f26ce71ca805282c616 (diff)
Bump uuid from 0.8.2 to 1.0.0 (#311)
* Bump uuid from 0.8.2 to 1.0.0 Bumps [uuid](https://github.com/uuid-rs/uuid) from 0.8.2 to 1.0.0. - [Release notes](https://github.com/uuid-rs/uuid/releases) - [Commits](https://github.com/uuid-rs/uuid/compare/0.8.2...1.0.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * patch Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Conrad Ludgate <conrad.ludgate@truelayer.com>
-rw-r--r--Cargo.lock5
-rw-r--r--atuin-client/Cargo.toml3
-rw-r--r--atuin-common/Cargo.toml2
-rw-r--r--atuin-common/src/utils.rs2
-rw-r--r--atuin-server/Cargo.toml4
-rw-r--r--atuin-server/src/handlers/user.rs2
6 files changed, 8 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 21c7187b..dcfb7ed5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2167,7 +2167,6 @@ dependencies = [
"thiserror",
"tokio-stream",
"url",
- "uuid",
"webpki 0.21.4",
"webpki-roots 0.21.1",
"whoami",
@@ -2624,9 +2623,9 @@ checksum = "68b90931029ab9b034b300b797048cf23723400aa757e8a2bfb9d748102f9821"
[[package]]
name = "uuid"
-version = "0.8.2"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
+checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
dependencies = [
"getrandom",
]
diff --git a/atuin-client/Cargo.toml b/atuin-client/Cargo.toml
index c3a567d8..6736ac29 100644
--- a/atuin-client/Cargo.toml
+++ b/atuin-client/Cargo.toml
@@ -28,7 +28,7 @@ log = "0.4"
chrono = { version = "0.4", features = ["serde"] }
eyre = "0.6"
directories = "4"
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
whoami = "1.1.2"
chrono-english = "0.1.4"
config = "0.13"
@@ -40,7 +40,6 @@ itertools = "0.10.3"
shellexpand = "2"
sqlx = { version = "0.5", features = [
"runtime-tokio-rustls",
- "uuid",
"chrono",
"sqlite",
] }
diff --git a/atuin-common/Cargo.toml b/atuin-common/Cargo.toml
index 59caa796..fd0af955 100644
--- a/atuin-common/Cargo.toml
+++ b/atuin-common/Cargo.toml
@@ -14,4 +14,4 @@ repository = "https://github.com/ellie/atuin"
rust-crypto = "^0.2"
chrono = { version = "0.4", features = ["serde"] }
serde = { version = "1.0.126", features = ["derive"] }
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
diff --git a/atuin-common/src/utils.rs b/atuin-common/src/utils.rs
index 23e34252..3e3e645b 100644
--- a/atuin-common/src/utils.rs
+++ b/atuin-common/src/utils.rs
@@ -13,7 +13,7 @@ pub fn hash_str(string: &str) -> String {
}
pub fn uuid_v4() -> String {
- Uuid::new_v4().to_simple().to_string()
+ Uuid::new_v4().as_simple().to_string()
}
// TODO: more reliable, more tested
diff --git a/atuin-server/Cargo.toml b/atuin-server/Cargo.toml
index c1342bfb..480b090a 100644
--- a/atuin-server/Cargo.toml
+++ b/atuin-server/Cargo.toml
@@ -14,7 +14,7 @@ atuin-common = { path = "../atuin-common", version = "0.8.1" }
tracing = "0.1"
chrono = { version = "0.4", features = ["serde"] }
eyre = "0.6"
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
whoami = "1.1.2"
config = "0.13"
serde = { version = "1.0.126", features = ["derive"] }
@@ -24,7 +24,7 @@ base64 = "0.13.0"
rand = "0.8.4"
rust-crypto = "^0.2"
tokio = { version = "1", features = ["full"] }
-sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "uuid", "chrono", "postgres" ] }
+sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "chrono", "postgres" ] }
async-trait = "0.1.49"
axum = "0.5"
http = "0.2"
diff --git a/atuin-server/src/handlers/user.rs b/atuin-server/src/handlers/user.rs
index 862f228c..a57269a0 100644
--- a/atuin-server/src/handlers/user.rs
+++ b/atuin-server/src/handlers/user.rs
@@ -82,7 +82,7 @@ pub async fn register(
}
};
- let token = Uuid::new_v4().to_simple().to_string();
+ let token = Uuid::new_v4().as_simple().to_string();
let new_session = NewSession {
user_id,