Skip to content

Commit

Permalink
Bump uuid from 0.8.2 to 1.0.0 (#311)
Browse files Browse the repository at this point in the history
* 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](uuid-rs/uuid@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>
  • Loading branch information
dependabot[bot] and conradludgate authored Apr 22, 2022
1 parent 831cc98 commit 89549b3
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
5 changes: 2 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions atuin-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -40,7 +40,6 @@ itertools = "0.10.3"
shellexpand = "2"
sqlx = { version = "0.5", features = [
"runtime-tokio-rustls",
"uuid",
"chrono",
"sqlite",
] }
Expand Down
2 changes: 1 addition & 1 deletion atuin-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
2 changes: 1 addition & 1 deletion atuin-common/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions atuin-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion atuin-server/src/handlers/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 89549b3

Please sign in to comment.