Skip to content

Commit fc68151

Browse files
authored
Merge branch 'master' into players-subdivision-query
2 parents 7571271 + c8b17ae commit fc68151

File tree

11 files changed

+88
-58
lines changed

11 files changed

+88
-58
lines changed

Cargo.lock

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

pointercrate-core-api/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ serde = "1.0.217"
1111
rocket = {version = "0.5.1", features = ["json"]}
1212
pointercrate-core = {path = "../pointercrate-core"}
1313
pointercrate-core-pages = {path = "../pointercrate-core-pages"}
14-
serde_json = "1.0.135"
14+
serde_json = "1.0.137"
1515
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono" ] }
16-
log = "0.4.22"
16+
log = "0.4.25"
1717
serde_urlencoded = "0.7.0"
1818
maud = "0.26.0"

pointercrate-core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ edition.workspace = true
1010
serde = "1.0.217"
1111
derive_more = "0.99.18"
1212
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate"] }
13-
log = "0.4.22"
13+
log = "0.4.25"
1414
chrono = {version = "0.4.39", features = ["serde"]}
15-
getrandom = "0.2.15"
15+
getrandom = "0.3.0"

pointercrate-core/src/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ where
3636
pub fn csprng_u64() -> Result<u64, CoreError> {
3737
let mut buf = [0u8; 8];
3838

39-
getrandom::getrandom(buf.as_mut_slice())
39+
getrandom::fill(buf.as_mut_slice())
4040
.map_err(|err| CoreError::internal_server_error(format!("getrandom: {}", err)))
4141
.map(|()| u64::from_le_bytes(buf))
4242
}

pointercrate-demonlist-api/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pointercrate-user = {path = "../pointercrate-user"}
1717
pointercrate-user-api = {path = "../pointercrate-user-api"}
1818
pointercrate-integrate = {path = "../pointercrate-integrate"}
1919
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
20-
serde_json = "1.0.135"
21-
log = "0.4.22"
20+
serde_json = "1.0.137"
21+
log = "0.4.25"
2222
serde_urlencoded = "0.7.0"
2323
nonzero_ext = "0.3.0"
2424
reqwest = {version = "0.12.*", features = ["json"]}

pointercrate-demonlist-pages/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ maud = "0.26.0"
1717
chrono = "0.4.39"
1818
url = "2.5.4"
1919
async-trait = "0.1.85"
20-
log = "0.4.22"
20+
log = "0.4.25"
2121
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }

pointercrate-demonlist/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-
1212
derive_more = "0.99.18"
1313
pointercrate-core = {path = "../pointercrate-core"}
1414
pointercrate-user = {path = "../pointercrate-user"}
15-
log = "0.4.22"
15+
log = "0.4.25"
1616
futures = "0.3.31"
1717
chrono = {version = "0.4.39", features = ["serde"]}
1818
url = "2.5.4"

pointercrate-integrate/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-
1111
bincode = "1.3.1"
1212
reqwest = "0.12.*"
1313
futures = "0.3.31"
14-
log = "0.4.22"
14+
log = "0.4.25"
1515
chrono = "0.4.39"
1616
tokio = {version = "1.43.0", features = ["rt"]}
1717
pointercrate-demonlist = { path = "../pointercrate-demonlist" }

pointercrate-test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ pointercrate-user-pages = {path = "../pointercrate-user-pages", features = ["leg
1717
serde = "1.0.217"
1818
sqlx = { version = "0.8", default-features = false, features = [ "runtime-tokio-native-tls", "macros", "postgres", "chrono", "migrate" ] }
1919
rocket = "0.5.1"
20-
serde_json = "1.0.135"
20+
serde_json = "1.0.137"
2121
dotenv = "0.15.0"
2222
serde_urlencoded = "0.7.1"

0 commit comments

Comments
 (0)