Skip to content

Commit

Permalink
deps: bump axum to 0.8.1 (#276)
Browse files Browse the repository at this point in the history
  • Loading branch information
SHAcollision authored Jan 7, 2025
1 parent 31fe413 commit b7832c5
Show file tree
Hide file tree
Showing 24 changed files with 137 additions and 88 deletions.
113 changes: 82 additions & 31 deletions Cargo.lock

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

16 changes: 12 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@ pkarr = { git = "https://github.com/Pubky/pkarr", branch = "v3", package = "pkar
"async",
] }
pubky = "0.3.0"
pubky-app-specs = { version = "0.2.1", features = ["openapi"] }
pubky-app-specs = { git = "https://github.com/pubky/pubky-app-specs", features = [
"openapi",
] }
tokio = { version = "1.42.0", features = ["full"] }
axum = "0.7.9"
axum = "0.8.1"
redis = { version = "0.27.6", features = ["tokio-comp", "json"] }
neo4rs = "0.8.0"
serde = { version = "1.0.217", features = ["derive"] }
serde_json = "1.0.134"
once_cell = "1.20.2"
utoipa = "5.3.0"
utoipa-swagger-ui = { version = "8.1.0", features = ["axum"] }
utoipa = { git = "https://github.com/juhaku/utoipa", rev = "d522f744259dc4fde5f45d187983fb68c8167029" }
utoipa-swagger-ui = { git = "https://github.com/juhaku/utoipa", rev = "d522f744259dc4fde5f45d187983fb68c8167029", features = [
"axum",
] }
tower-http = { version = "0.6.2", features = ["fs", "cors"] }
dotenv = "0.15"
log = "0.4.22"
Expand All @@ -36,6 +40,7 @@ reqwest = "0.12.9"
base32 = "0.5.1"
blake3 = "1.5.5"
url = "2.5.4"
async-trait = "0.1.84"

[dev-dependencies]
anyhow = "1.0.95"
Expand All @@ -46,6 +51,9 @@ rand = "0.8.5"
rand_distr = "0.4.3"
tokio-shared-rt = "0.1"

[patch.crates-io]
utoipa-swagger-ui = { git = "https://github.com/juhaku/utoipa", rev = "d522f744259dc4fde5f45d187983fb68c8167029" }

[lib]
name = "pubky_nexus"
path = "src/lib.rs"
Expand Down
2 changes: 1 addition & 1 deletion src/db/kv/traits.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::index::*;
use crate::types::DynError;
use axum::async_trait;
use async_trait::async_trait;
use json::JsonAction;
use serde::{de::DeserializeOwned, Serialize};
use sorted_sets::{ScoreAction, SortOrder, SORTED_PREFIX};
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ pub use events::processor::EventProcessor;
pub use reindex::reindex;
pub use setup::setup;

#[macro_use]
extern crate const_format;
2 changes: 1 addition & 1 deletion src/models/file/details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::db::graph::exec::exec_single_row;
use crate::models::traits::Collection;
use crate::types::DynError;
use crate::{queries, RedisOps};
use axum::async_trait;
use async_trait::async_trait;
use chrono::Utc;
use neo4rs::Query;
use pubky_app_specs::PubkyAppFile;
Expand Down
2 changes: 1 addition & 1 deletion src/models/follow/followers.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{queries, RedisOps};
use axum::async_trait;
use async_trait::async_trait;
use neo4rs::Query;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
Expand Down
2 changes: 1 addition & 1 deletion src/models/follow/following.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{queries, RedisOps};
use axum::async_trait;
use async_trait::async_trait;
use neo4rs::Query;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
Expand Down
2 changes: 1 addition & 1 deletion src/models/follow/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::db::connectors::neo4j::get_neo4j_graph;
use crate::db::graph::exec::exec_boolean_row;
use crate::types::DynError;
use crate::{queries, RedisOps};
use axum::async_trait;
use async_trait::async_trait;
use chrono::Utc;
use neo4rs::Query;

Expand Down
2 changes: 1 addition & 1 deletion src/models/tag/post.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::RedisOps;
use axum::async_trait;
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;

Expand Down
2 changes: 1 addition & 1 deletion src/models/tag/stream.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::db::graph::exec::retrieve_from_graph;
use crate::db::kv::index::sorted_sets::SortOrder;
use crate::types::{DynError, Timeframe};
use axum::async_trait;
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fmt::Display;
Expand Down
2 changes: 1 addition & 1 deletion src/models/tag/traits/collection.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::types::DynError;
use axum::async_trait;
use async_trait::async_trait;
use log::error;
use neo4rs::Query;

Expand Down
2 changes: 1 addition & 1 deletion src/models/tag/traits/taggers.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::types::{DynError, Pagination};
use crate::RedisOps;
use axum::async_trait;
use async_trait::async_trait;

use super::collection::CACHE_SET_PREFIX;

Expand Down
2 changes: 1 addition & 1 deletion src/models/tag/user.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::RedisOps;
use axum::async_trait;
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;

Expand Down
2 changes: 1 addition & 1 deletion src/models/traits.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use axum::async_trait;
use async_trait::async_trait;
use neo4rs::Query;

use crate::db::connectors::neo4j::get_neo4j_graph;
Expand Down
2 changes: 1 addition & 1 deletion src/models/user/details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::models::traits::Collection;
use crate::types::DynError;
use crate::types::PubkyId;
use crate::{queries, RedisOps};
use axum::async_trait;
use async_trait::async_trait;
use chrono::Utc;
use neo4rs::Query;
use pubky_app_specs::{PubkyAppUser, PubkyAppUserLink};
Expand Down
2 changes: 1 addition & 1 deletion src/models/user/follows.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// use crate::db::connectors::neo4j::get_neo4j_graph;
// use crate::db::graph::exec::exec_boolean_row;
// use crate::{queries, RedisOps};
// use axum::async_trait;
// use async_trait::async_trait;
// use chrono::Utc;
// use neo4rs::Query;
// use serde::{Deserialize, Serialize};
Expand Down
2 changes: 1 addition & 1 deletion src/models/user/muted.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::db::connectors::neo4j::get_neo4j_graph;
use crate::db::graph::exec::exec_single_row;
use crate::types::DynError;
use crate::{queries, RedisOps};
use axum::async_trait;
use async_trait::async_trait;
use chrono::Utc;
use serde::{Deserialize, Serialize};
use utoipa::ToSchema;
Expand Down
Loading

0 comments on commit b7832c5

Please sign in to comment.