Skip to content
This repository has been archived by the owner on Sep 21, 2024. It is now read-only.

chore: async compat to tokio utils #725

Merged
merged 4 commits into from
Jan 16, 2024
Merged

chore: async compat to tokio utils #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2da9bdc
chore: consolidate on tokio-util for stream compat; [email protected].…
jsantell Nov 15, 2023
3a5796e
chore: Use explicit version for `subtext` package
cdata Jan 16, 2024
6da786a
Merge branch 'main' into async-compat-to-tokio-utils
cdata Jan 16, 2024
1d64b5c
chore: Update Cargo.lock
cdata Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ serde_urlencoded = { version = "~0.7" }
serde-wasm-bindgen = { version = "0.4" }
strum = { version = "0.25" }
strum_macros = { version = "0.25" }
subtext = { version = "0.3.4" }
subtext = { version = "0.3.5" }
symlink = { version = "0.1" }
tempfile = { version = "^3" }
thiserror = { version = "1" }
Expand Down
3 changes: 1 addition & 2 deletions rust/noosphere-into/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ readme = "README.md"
[dependencies]
noosphere-core = { version = "0.18.0", path = "../noosphere-core" }
noosphere-storage = { version = "0.10.0", path = "../noosphere-storage" }
subtext = { version = "0.3.2", features = ["stream"] }
subtext = { workspace = true, features = ["stream"] }
async-trait = "~0.1"
url = { workspace = true }
tracing = { workspace = true }
Expand All @@ -36,7 +36,6 @@ tokio = { workspace = true, features = ["io-util", "macros", "test-util"] }

async-stream = { workspace = true }
futures = { workspace = true }
async-compat = { version = "~0.2" }
async-utf8-decoder = { version = "~0.3" }

ucan = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion rust/noosphere-ipfs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ test-kubo = []

[dependencies]
anyhow = { workspace = true }
async-compat = { version = "~0.2" }
async-trait = "~0.1"
async-stream = { workspace = true }
libipld-core = { workspace = true }
Expand All @@ -37,6 +36,7 @@ serde = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["io-util"] }
tokio-stream = { workspace = true }
tokio-util = { workspace = true, features = ["compat"] }
tracing = { workspace = true }
url = { workspace = true, features = [ "serde" ] }
noosphere-storage = { version = "0.10.0", path = "../noosphere-storage" }
Expand Down
2 changes: 1 addition & 1 deletion rust/noosphere-ipfs/src/client/kubo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ use super::{IpfsClient, IpfsClientAsyncReadSendSync};
use async_trait::async_trait;

use anyhow::{anyhow, Result};
use async_compat::CompatExt;
use cid::Cid;
use hyper::{
client::connect::dns::GaiResolver, client::HttpConnector, Body, Client, Request, StatusCode,
};
use hyper_multipart_rfc7578::client::multipart::{Body as MultipartBody, Form};
use tokio_util::compat::TokioAsyncReadCompatExt;
// TODO(#587): Remove dependency on `ipfs-api` crate
use ipfs_api_prelude::response::{PinAddResponse, PinLsResponse};
use libipld_cbor::DagCborCodec;
Expand Down
Loading