diff --git a/Cargo.lock b/Cargo.lock index 812a8791..b1be8960 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -687,9 +687,9 @@ dependencies = [ "clap", "confique", "futures", - "rustls", "jacquard-common", "jacquard-identity", + "rustls", "serde", "socket2", "thiserror 2.0.18", diff --git a/bobbin/crates/resolver/src/legacy_upgrade.rs b/bobbin/crates/resolver/src/legacy_upgrade.rs index 365404a5..7047490a 100644 --- a/bobbin/crates/resolver/src/legacy_upgrade.rs +++ b/bobbin/crates/resolver/src/legacy_upgrade.rs @@ -784,7 +784,12 @@ mod tests { let owner = did("did:plc:nel"); let key = rkey("abcabcabcabcz"); resolver - .observe(owner.clone(), key.clone(), Some(did("did:plc:scallop")), None) + .observe( + owner.clone(), + key.clone(), + Some(did("did:plc:scallop")), + None, + ) .await; let json = br#"{"$type":"sh.tangled.repo.issue","repo":"at://did:plc:nel/sh.tangled.repo/abcabcabcabcz","title":"t","createdAt":"2026-05-01T00:00:00Z"}"#; let legacy = @@ -1036,7 +1041,12 @@ mod tests { let owner = did("did:plc:nel"); let key = rkey("abcabcabcabcz"); resolver - .observe(owner.clone(), key.clone(), Some(did("did:plc:scallop")), None) + .observe( + owner.clone(), + key.clone(), + Some(did("did:plc:scallop")), + None, + ) .await; let json = br#"{"$type":"sh.tangled.feed.star","createdAt":"2026-05-01T00:00:00Z","subject":"at://did:plc:nel/sh.tangled.repo/abcabcabcabcz"}"#; let legacy = diff --git a/bobbin/crates/resolver/src/lib.rs b/bobbin/crates/resolver/src/lib.rs index 2cbb38dd..cee8a4fc 100644 --- a/bobbin/crates/resolver/src/lib.rs +++ b/bobbin/crates/resolver/src/lib.rs @@ -494,7 +494,12 @@ mod tests { assert!(prior.is_none(), "first observation has no prior"); let prior = resolver - .observe(did("did:plc:nel"), rkey("core"), Some(did("did:plc:clam")), None) + .observe( + did("did:plc:nel"), + rkey("core"), + Some(did("did:plc:clam")), + None, + ) .await; assert_eq!( prior, @@ -503,7 +508,12 @@ mod tests { ); let prior = resolver - .observe(did("did:plc:nel"), rkey("core"), Some(did("did:plc:clam")), None) + .observe( + did("did:plc:nel"), + rkey("core"), + Some(did("did:plc:clam")), + None, + ) .await; assert!(prior.is_none(), "re-observing the same ident is a no-op"); } @@ -529,7 +539,12 @@ mod tests { ) .await; resolver - .observe(did("did:plc:nel"), rkey("core"), Some(did("did:plc:clam")), None) + .observe( + did("did:plc:nel"), + rkey("core"), + Some(did("did:plc:clam")), + None, + ) .await; resolver @@ -619,7 +634,10 @@ mod tests { ) .await; let got = resolver.lookup_by_name(&did("did:plc:olaren"), "ark").await; - assert_eq!(got, None, "one owner's repo name must not answer for another's"); + assert_eq!( + got, None, + "one owner's repo name must not answer for another's" + ); } #[tokio::test] @@ -810,7 +828,9 @@ mod tests { let resolver = RepoIdResolver::detached(RuntimeHasher::default()); let owner = did("did:plc:nel"); let key = rkey("abcabcabcabcz"); - resolver.observe(owner.clone(), key.clone(), None, None).await; + resolver + .observe(owner.clone(), key.clone(), None, None) + .await; resolver .fill_provisional( RepoIdent::new(owner.clone(), key.clone()), @@ -1150,7 +1170,9 @@ mod tests { Resolution::Mapped(did("did:plc:clam")), ) .await; - resolver.observe(owner.clone(), key.clone(), None, None).await; + resolver + .observe(owner.clone(), key.clone(), None, None) + .await; let got = resolver.resolve(&owner, &key).await; assert_eq!( got, diff --git a/bobbin/crates/runtime/src/network.rs b/bobbin/crates/runtime/src/network.rs index 90359f6b..ede0d91c 100644 --- a/bobbin/crates/runtime/src/network.rs +++ b/bobbin/crates/runtime/src/network.rs @@ -116,7 +116,9 @@ impl jacquard_common::http_client::HttpClient for ReqwestHttp { builder = builder.header(name, value); } let body = resp.bytes().await?.to_vec(); - Ok(builder.body(body).expect("response parts came from reqwest")) + Ok(builder + .body(body) + .expect("response parts came from reqwest")) } } diff --git a/bobbin/crates/xrpc/src/feed.rs b/bobbin/crates/xrpc/src/feed.rs index 4a78c416..27049e97 100644 --- a/bobbin/crates/xrpc/src/feed.rs +++ b/bobbin/crates/xrpc/src/feed.rs @@ -4,7 +4,7 @@ use futures::stream::{self, StreamExt}; use serde::Deserialize; use bobbin_edge_index::{EdgeItem, EdgePage, EdgeStore, PageCursor, PageLimit, PageToken, SortDir}; -use bobbin_types::ids::{nsid_static, owner_did_from_aturi, EdgeKey, SubjectRef}; +use bobbin_types::ids::{EdgeKey, SubjectRef, nsid_static, owner_did_from_aturi}; use bobbin_types::sh_tangled::actor::{ProfileViewBasic, ProfileViewDetailed, ViewerState}; use bobbin_types::sh_tangled::feed::get_timeline::{ FollowEvent, RepoEvent, StarEvent, TimelineItem, TimelineItemEvent, @@ -12,13 +12,13 @@ use bobbin_types::sh_tangled::feed::get_timeline::{ use bobbin_types::sh_tangled::feed::star::{Star, StarRecord, StarSubject}; use bobbin_types::sh_tangled::graph::follow::{Follow, FollowRecord}; use bobbin_types::sh_tangled::repo::{self, Repo, RepoRecord, RepoViewBasic}; +use jacquard_common::DefaultStr; use jacquard_common::types::string::{AtUri, Datetime, Did, Handle, UriValue}; use jacquard_common::xrpc::XrpcResp; -use jacquard_common::DefaultStr; use jacquard_identity::resolver::IdentityResolver; use crate::{ - fetch, json_stream, paged_tail, parse_cursor, parse_limit, AppState, XrpcError, XrpcQuery, + AppState, XrpcError, XrpcQuery, fetch, json_stream, paged_tail, parse_cursor, parse_limit, }; const REPO_NSID: &str = "sh.tangled.repo";