From 237838dc83456a6df51ce678b3d77643a35267ff Mon Sep 17 00:00:00 2001 From: ben potter Date: Thu, 3 Apr 2025 20:41:21 -0400 Subject: [PATCH 1/4] bump atrium_api from v0.24.10 to v0.25.2 --- Cargo.lock | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 410 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 488f37b..83381d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,6 +26,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -110,6 +116,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "async-lock" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-trait" version = "0.1.86" @@ -133,6 +150,26 @@ version = "0.24.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c5d74937642f6b21814e82d80f54d55ebd985b681bffbe27c8a76e726c3c4db" dependencies = [ + "atrium-xrpc", + "chrono", + "http 1.2.0", + "ipld-core", + "langtag", + "regex", + "serde", + "serde_bytes", + "serde_json", + "thiserror 1.0.69", + "trait-variant", +] + +[[package]] +name = "atrium-api" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d4eb9b4787aba546015c8ccda1d3924c157cee13d67848997fba74ac8144a07" +dependencies = [ + "atrium-common", "atrium-xrpc", "chrono", "http 1.2.0", @@ -147,11 +184,26 @@ dependencies = [ "trait-variant", ] +[[package]] +name = "atrium-common" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba30d2f9e1a8b3db8fc97d0a5f91ee5a28f8acdddb771ad74c1b08eda357ca3d" +dependencies = [ + "dashmap", + "lru", + "moka", + "thiserror 1.0.69", + "tokio", + "trait-variant", + "web-time", +] + [[package]] name = "atrium-xrpc" -version = "0.12.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f223b98be2acdd7afe5b867744aee8258413ed09993099de0a036b247db0ec4c" +checksum = "18a9e526cb2ed3e0a2ca78c3ce2a943d9041a68e067dadf42923b523771e07df" dependencies = [ "http 1.2.0", "serde", @@ -378,6 +430,15 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "console" version = "0.15.10" @@ -433,6 +494,30 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crypto-common" version = "0.1.6" @@ -443,6 +528,20 @@ dependencies = [ "typenum", ] +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "data-encoding" version = "2.7.0" @@ -550,6 +649,27 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "event-listener" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "fallible-iterator" version = "0.3.0" @@ -680,6 +800,19 @@ dependencies = [ "slab", ] +[[package]] +name = "generator" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" +dependencies = [ + "cfg-if", + "libc", + "log", + "rustversion", + "windows", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -765,12 +898,20 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98f494b2060b2a8f5e63379e1e487258e014cee1b1725a735816c0107a2e9d93" +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "hashbrown" version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ + "allocator-api2", + "equivalent", "foldhash", ] @@ -780,7 +921,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -994,7 +1135,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1152,7 +1293,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -1204,7 +1345,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbde770c76b32262a837d968850d29232189844f4e11a3f02a3d87473929f7e9" dependencies = [ "async-trait", - "atrium-api", + "atrium-api 0.24.10", "chrono", "flume", "futures-util", @@ -1247,6 +1388,12 @@ dependencies = [ "serde", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + [[package]] name = "libc" version = "0.2.169" @@ -1298,6 +1445,37 @@ version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "lru" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +dependencies = [ + "hashbrown 0.15.2", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "memchr" version = "2.7.4" @@ -1340,6 +1518,28 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "moka" +version = "0.12.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" +dependencies = [ + "async-lock", + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "event-listener", + "futures-util", + "loom", + "parking_lot", + "portable-atomic", + "rustc_version", + "smallvec", + "tagptr", + "thiserror 1.0.69", + "uuid", +] + [[package]] name = "multer" version = "2.1.0" @@ -1406,6 +1606,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -1484,6 +1694,18 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.12.3" @@ -1551,6 +1773,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "portable-atomic" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" + [[package]] name = "ppv-lite86" version = "0.2.20" @@ -1638,8 +1866,17 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.9", + "regex-syntax 0.8.5", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -1650,9 +1887,15 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.5", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.5" @@ -1740,6 +1983,15 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + [[package]] name = "rustdoc-json" version = "0.9.4" @@ -1975,6 +2227,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.3.0" @@ -2001,7 +2262,7 @@ name = "skyfeed" version = "0.6.0" dependencies = [ "anyhow", - "atrium-api", + "atrium-api 0.25.2", "atrium-xrpc-client", "chrono", "clap", @@ -2126,6 +2387,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tempfile" version = "3.16.0" @@ -2180,6 +2447,16 @@ dependencies = [ "syn", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tinystr" version = "0.7.6" @@ -2370,6 +2647,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -2493,6 +2800,21 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "uuid" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +dependencies = [ + "getrandom 0.3.1", +] + +[[package]] +name = "valuable" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" + [[package]] name = "vcpkg" version = "0.2.15" @@ -2639,6 +2961,48 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -2648,6 +3012,41 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "windows-registry" version = "0.2.0" diff --git a/Cargo.toml b/Cargo.toml index ac84918..ed7c6a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ path = "examples/sqlite/src/main.rs" required-features = ["examples"] [dependencies] -atrium-api = "=0.24.10" +atrium-api = "0.25.2" dotenv = "0.15.0" env_logger = "0.11.5" jetstream-oxide = "0.1.1" From f6b53e61602bc7e76bb46cf5e102ce2a393d471d Mon Sep 17 00:00:00 2001 From: cyypherus Date: Fri, 4 Apr 2025 10:18:21 -0600 Subject: [PATCH 2/4] update and pin jetstream-oxide and atrium-api --- Cargo.lock | 27 ++++----------------------- Cargo.toml | 4 ++-- src/bin/my_did.rs | 2 +- src/bin/publish.rs | 6 ++++-- src/bin/unpublish.rs | 8 +++++--- 5 files changed, 16 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83381d9..e299a4c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,25 +144,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atrium-api" -version = "0.24.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5d74937642f6b21814e82d80f54d55ebd985b681bffbe27c8a76e726c3c4db" -dependencies = [ - "atrium-xrpc", - "chrono", - "http 1.2.0", - "ipld-core", - "langtag", - "regex", - "serde", - "serde_bytes", - "serde_json", - "thiserror 1.0.69", - "trait-variant", -] - [[package]] name = "atrium-api" version = "0.25.2" @@ -1340,12 +1321,12 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jetstream-oxide" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbde770c76b32262a837d968850d29232189844f4e11a3f02a3d87473929f7e9" +checksum = "a267b4f381f1db945e9eb6b9ff0f3070950cc01521fef6265556b6a683e41e13" dependencies = [ "async-trait", - "atrium-api 0.24.10", + "atrium-api", "chrono", "flume", "futures-util", @@ -2262,7 +2243,7 @@ name = "skyfeed" version = "0.6.0" dependencies = [ "anyhow", - "atrium-api 0.25.2", + "atrium-api", "atrium-xrpc-client", "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index ed7c6a9..5b36917 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,10 +37,10 @@ path = "examples/sqlite/src/main.rs" required-features = ["examples"] [dependencies] -atrium-api = "0.25.2" +atrium-api = "=0.25.2" dotenv = "0.15.0" env_logger = "0.11.5" -jetstream-oxide = "0.1.1" +jetstream-oxide = "=0.1.2" log = "0.4.22" serde = "1.0.215" serde_json = "1.0.133" diff --git a/src/bin/my_did.rs b/src/bin/my_did.rs index df58551..eadf7d9 100644 --- a/src/bin/my_did.rs +++ b/src/bin/my_did.rs @@ -1,6 +1,6 @@ use anyhow::Result; use atrium_api::{ - agent::{store::MemorySessionStore, AtpAgent}, + agent::atp_agent::{store::MemorySessionStore, AtpAgent}, types::string::Handle, }; use clap::Parser; diff --git a/src/bin/publish.rs b/src/bin/publish.rs index ce145e8..9de7f3c 100644 --- a/src/bin/publish.rs +++ b/src/bin/publish.rs @@ -1,6 +1,7 @@ use atrium_api::com::atproto::repo::put_record::InputData; +use atrium_api::types::string::RecordKey; use atrium_api::{ - agent::{store::MemorySessionStore, AtpAgent}, + agent::atp_agent::{store::MemorySessionStore, AtpAgent}, app::bsky::feed::generator::RecordData, types::{ string::{Datetime, Did, Handle, Nsid}, @@ -50,6 +51,7 @@ async fn main() { let handle = args.handle; let password = args.app_password; let feed_host_name = args.hostname; + let record_key = RecordKey::new(args.name.to_owned()).expect("Invalid record key name."); println!("Logging in..."); @@ -122,7 +124,7 @@ async fn main() { repo: atrium_api::types::string::AtIdentifier::Did( publisher_did.to_owned().did.clone(), ), - rkey: args.name.to_owned(), + rkey: record_key, swap_commit: None, swap_record: None, validate: None, diff --git a/src/bin/unpublish.rs b/src/bin/unpublish.rs index 354331d..43a1cbd 100644 --- a/src/bin/unpublish.rs +++ b/src/bin/unpublish.rs @@ -1,7 +1,7 @@ use anyhow::Result; use atrium_api::{ - agent::{store::MemorySessionStore, AtpAgent}, - types::string::{Handle, Nsid}, + agent::atp_agent::{store::MemorySessionStore, AtpAgent}, + types::string::{Handle, Nsid, RecordKey}, }; use clap::Parser; @@ -29,6 +29,8 @@ async fn main() -> Result<()> { let handle = args.handle; let password = args.app_password; + let record_key = RecordKey::new(args.name.to_owned()).expect("Invalid record key name."); + println!("Logging in"); let agent = AtpAgent::new( @@ -62,7 +64,7 @@ async fn main() -> Result<()> { repo: atrium_api::types::string::AtIdentifier::Did( publisher_did.to_owned().did.clone(), ), - rkey: args.name.to_owned(), + rkey: record_key, swap_commit: None, swap_record: None, } From a3176ee566d0703ec295ede91a58c321f7c29625 Mon Sep 17 00:00:00 2001 From: cyypherus Date: Fri, 4 Apr 2025 11:22:23 -0600 Subject: [PATCH 3/4] replace atrium type with u8, new api snapshot, explicit export list --- src/feed.rs | 2 +- src/lib.rs | 5 +- src/models.rs | 4 +- .../skyfeed__public_api_test__public_api.snap | 149 +++++++++++++++++- 4 files changed, 155 insertions(+), 5 deletions(-) diff --git a/src/feed.rs b/src/feed.rs index b460868..f743bcd 100644 --- a/src/feed.rs +++ b/src/feed.rs @@ -283,7 +283,7 @@ async fn get_feed_skeleton( .serve_feed(Request { cursor: query.cursor.clone(), feed: query.feed.clone(), - limit: query.limit, + limit: query.limit.map(|l| u8::from(l)), }) .await; Ok::(warp::reply::json(&FeedSkeleton { diff --git a/src/lib.rs b/src/lib.rs index 04fa279..9e4af7a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,4 +7,7 @@ mod utility_models; pub use feed::Feed; pub use feed_handler::FeedHandler; -pub use models::*; +pub use models::{ + Cid, Did, Embed, ExternalEmbed, FeedResult, ImageEmbed, Label, MediaEmbed, Post, QuoteEmbed, + Request, Uri, VideoEmbed, +}; diff --git a/src/models.rs b/src/models.rs index a424b7c..81ee1be 100644 --- a/src/models.rs +++ b/src/models.rs @@ -3,7 +3,7 @@ use atrium_api::{ embed::record_with_media::MainMediaRefs, feed::post::{RecordEmbedRefs, RecordLabelsRefs}, }, - types::{BlobRef, LimitedNonZeroU8, Object, TypedBlobRef, Union}, + types::{BlobRef, Object, TypedBlobRef, Union}, }; use chrono::{DateTime, Utc}; use log::trace; @@ -12,7 +12,7 @@ use log::trace; pub struct Request { pub cursor: Option, pub feed: String, - pub limit: Option>, + pub limit: Option, } #[derive(Debug, Clone)] diff --git a/src/snapshots/skyfeed__public_api_test__public_api.snap b/src/snapshots/skyfeed__public_api_test__public_api.snap index 1f1710d..47c7607 100644 --- a/src/snapshots/skyfeed__public_api_test__public_api.snap +++ b/src/snapshots/skyfeed__public_api_test__public_api.snap @@ -19,6 +19,10 @@ impl core::marker::Sync for skyfeed::Embed impl core::marker::Unpin for skyfeed::Embed impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Embed impl core::panic::unwind_safe::UnwindSafe for skyfeed::Embed +impl atrium_common::types::throttled::Throttleable

for skyfeed::Embed where P: core::default::Default +pub fn skyfeed::Embed::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::Embed +pub fn skyfeed::Embed::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Embed where U: core::convert::From pub fn skyfeed::Embed::into(self) -> U impl core::convert::TryFrom for skyfeed::Embed where U: core::convert::Into @@ -41,6 +45,13 @@ impl core::clone::CloneToUninit for skyfeed::Embed where T: core::clone::Clon pub unsafe fn skyfeed::Embed::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Embed pub fn skyfeed::Embed::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Embed +pub type skyfeed::Embed::Init = T +pub const skyfeed::Embed::ALIGN: usize +pub unsafe fn skyfeed::Embed::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Embed::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Embed::drop(ptr: usize) +pub unsafe fn skyfeed::Embed::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Embed impl tracing::instrument::Instrument for skyfeed::Embed impl tracing::instrument::WithSubscriber for skyfeed::Embed @@ -74,10 +85,16 @@ impl core::marker::Sync for skyfeed::Label impl core::marker::Unpin for skyfeed::Label impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Label impl core::panic::unwind_safe::UnwindSafe for skyfeed::Label +impl atrium_common::types::throttled::Throttleable

for skyfeed::Label where P: core::default::Default +pub fn skyfeed::Label::throttled(self) -> atrium_common::types::throttled::Throttled impl equivalent::Equivalent for skyfeed::Label where Q: core::cmp::Eq + ?core::marker::Sized, K: core::borrow::Borrow + ?core::marker::Sized pub fn skyfeed::Label::equivalent(&self, key: &K) -> bool impl hashbrown::Equivalent for skyfeed::Label where Q: core::cmp::Eq + ?core::marker::Sized, K: core::borrow::Borrow + ?core::marker::Sized +impl hashbrown::Equivalent for skyfeed::Label where Q: core::cmp::Eq + ?core::marker::Sized, K: core::borrow::Borrow + ?core::marker::Sized +pub fn skyfeed::Label::equivalent(&self, key: &K) -> bool pub fn skyfeed::Label::equivalent(&self, key: &K) -> bool +impl atrium_common::types::cached::Cacheable for skyfeed::Label +pub fn skyfeed::Label::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Label where U: core::convert::From pub fn skyfeed::Label::into(self) -> U impl core::convert::TryFrom for skyfeed::Label where U: core::convert::Into @@ -100,6 +117,13 @@ impl core::clone::CloneToUninit for skyfeed::Label where T: core::clone::Clon pub unsafe fn skyfeed::Label::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Label pub fn skyfeed::Label::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Label +pub type skyfeed::Label::Init = T +pub const skyfeed::Label::ALIGN: usize +pub unsafe fn skyfeed::Label::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Label::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Label::drop(ptr: usize) +pub unsafe fn skyfeed::Label::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Label impl tracing::instrument::Instrument for skyfeed::Label impl tracing::instrument::WithSubscriber for skyfeed::Label @@ -122,6 +146,10 @@ impl core::marker::Sync for skyfeed::MediaEmbed impl core::marker::Unpin for skyfeed::MediaEmbed impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::MediaEmbed impl core::panic::unwind_safe::UnwindSafe for skyfeed::MediaEmbed +impl atrium_common::types::throttled::Throttleable

for skyfeed::MediaEmbed where P: core::default::Default +pub fn skyfeed::MediaEmbed::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::MediaEmbed +pub fn skyfeed::MediaEmbed::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::MediaEmbed where U: core::convert::From pub fn skyfeed::MediaEmbed::into(self) -> U impl core::convert::TryFrom for skyfeed::MediaEmbed where U: core::convert::Into @@ -144,6 +172,13 @@ impl core::clone::CloneToUninit for skyfeed::MediaEmbed where T: core::clone: pub unsafe fn skyfeed::MediaEmbed::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::MediaEmbed pub fn skyfeed::MediaEmbed::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::MediaEmbed +pub type skyfeed::MediaEmbed::Init = T +pub const skyfeed::MediaEmbed::ALIGN: usize +pub unsafe fn skyfeed::MediaEmbed::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::MediaEmbed::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::MediaEmbed::drop(ptr: usize) +pub unsafe fn skyfeed::MediaEmbed::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::MediaEmbed impl tracing::instrument::Instrument for skyfeed::MediaEmbed impl tracing::instrument::WithSubscriber for skyfeed::MediaEmbed @@ -163,6 +198,10 @@ impl core::marker::Sync for skyfeed::Cid impl core::marker::Unpin for skyfeed::Cid impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Cid impl core::panic::unwind_safe::UnwindSafe for skyfeed::Cid +impl atrium_common::types::throttled::Throttleable

for skyfeed::Cid where P: core::default::Default +pub fn skyfeed::Cid::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::Cid +pub fn skyfeed::Cid::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Cid where U: core::convert::From pub fn skyfeed::Cid::into(self) -> U impl core::convert::TryFrom for skyfeed::Cid where U: core::convert::Into @@ -185,6 +224,13 @@ impl core::clone::CloneToUninit for skyfeed::Cid where T: core::clone::Clone pub unsafe fn skyfeed::Cid::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Cid pub fn skyfeed::Cid::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Cid +pub type skyfeed::Cid::Init = T +pub const skyfeed::Cid::ALIGN: usize +pub unsafe fn skyfeed::Cid::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Cid::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Cid::drop(ptr: usize) +pub unsafe fn skyfeed::Cid::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Cid impl tracing::instrument::Instrument for skyfeed::Cid impl tracing::instrument::WithSubscriber for skyfeed::Cid @@ -204,6 +250,10 @@ impl core::marker::Sync for skyfeed::Did impl core::marker::Unpin for skyfeed::Did impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Did impl core::panic::unwind_safe::UnwindSafe for skyfeed::Did +impl atrium_common::types::throttled::Throttleable

for skyfeed::Did where P: core::default::Default +pub fn skyfeed::Did::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::Did +pub fn skyfeed::Did::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Did where U: core::convert::From pub fn skyfeed::Did::into(self) -> U impl core::convert::TryFrom for skyfeed::Did where U: core::convert::Into @@ -226,6 +276,13 @@ impl core::clone::CloneToUninit for skyfeed::Did where T: core::clone::Clone pub unsafe fn skyfeed::Did::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Did pub fn skyfeed::Did::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Did +pub type skyfeed::Did::Init = T +pub const skyfeed::Did::ALIGN: usize +pub unsafe fn skyfeed::Did::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Did::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Did::drop(ptr: usize) +pub unsafe fn skyfeed::Did::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Did impl tracing::instrument::Instrument for skyfeed::Did impl tracing::instrument::WithSubscriber for skyfeed::Did @@ -249,6 +306,10 @@ impl core::marker::Sync for skyfeed::ExternalEmbed impl core::marker::Unpin for skyfeed::ExternalEmbed impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::ExternalEmbed impl core::panic::unwind_safe::UnwindSafe for skyfeed::ExternalEmbed +impl atrium_common::types::throttled::Throttleable

for skyfeed::ExternalEmbed where P: core::default::Default +pub fn skyfeed::ExternalEmbed::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::ExternalEmbed +pub fn skyfeed::ExternalEmbed::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::ExternalEmbed where U: core::convert::From pub fn skyfeed::ExternalEmbed::into(self) -> U impl core::convert::TryFrom for skyfeed::ExternalEmbed where U: core::convert::Into @@ -271,6 +332,13 @@ impl core::clone::CloneToUninit for skyfeed::ExternalEmbed where T: core::clo pub unsafe fn skyfeed::ExternalEmbed::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::ExternalEmbed pub fn skyfeed::ExternalEmbed::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::ExternalEmbed +pub type skyfeed::ExternalEmbed::Init = T +pub const skyfeed::ExternalEmbed::ALIGN: usize +pub unsafe fn skyfeed::ExternalEmbed::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::ExternalEmbed::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::ExternalEmbed::drop(ptr: usize) +pub unsafe fn skyfeed::ExternalEmbed::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::ExternalEmbed impl tracing::instrument::Instrument for skyfeed::ExternalEmbed impl tracing::instrument::WithSubscriber for skyfeed::ExternalEmbed @@ -292,6 +360,10 @@ impl core::marker::Sync for skyfeed::FeedResult impl core::marker::Unpin for skyfeed::FeedResult impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::FeedResult impl core::panic::unwind_safe::UnwindSafe for skyfeed::FeedResult +impl atrium_common::types::throttled::Throttleable

for skyfeed::FeedResult where P: core::default::Default +pub fn skyfeed::FeedResult::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::FeedResult +pub fn skyfeed::FeedResult::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::FeedResult where U: core::convert::From pub fn skyfeed::FeedResult::into(self) -> U impl core::convert::TryFrom for skyfeed::FeedResult where U: core::convert::Into @@ -314,6 +386,13 @@ impl core::clone::CloneToUninit for skyfeed::FeedResult where T: core::clone: pub unsafe fn skyfeed::FeedResult::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::FeedResult pub fn skyfeed::FeedResult::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::FeedResult +pub type skyfeed::FeedResult::Init = T +pub const skyfeed::FeedResult::ALIGN: usize +pub unsafe fn skyfeed::FeedResult::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::FeedResult::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::FeedResult::drop(ptr: usize) +pub unsafe fn skyfeed::FeedResult::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::FeedResult impl tracing::instrument::Instrument for skyfeed::FeedResult impl tracing::instrument::WithSubscriber for skyfeed::FeedResult @@ -336,6 +415,10 @@ impl core::marker::Sync for skyfeed::ImageEmbed impl core::marker::Unpin for skyfeed::ImageEmbed impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::ImageEmbed impl core::panic::unwind_safe::UnwindSafe for skyfeed::ImageEmbed +impl atrium_common::types::throttled::Throttleable

for skyfeed::ImageEmbed where P: core::default::Default +pub fn skyfeed::ImageEmbed::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::ImageEmbed +pub fn skyfeed::ImageEmbed::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::ImageEmbed where U: core::convert::From pub fn skyfeed::ImageEmbed::into(self) -> U impl core::convert::TryFrom for skyfeed::ImageEmbed where U: core::convert::Into @@ -358,6 +441,13 @@ impl core::clone::CloneToUninit for skyfeed::ImageEmbed where T: core::clone: pub unsafe fn skyfeed::ImageEmbed::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::ImageEmbed pub fn skyfeed::ImageEmbed::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::ImageEmbed +pub type skyfeed::ImageEmbed::Init = T +pub const skyfeed::ImageEmbed::ALIGN: usize +pub unsafe fn skyfeed::ImageEmbed::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::ImageEmbed::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::ImageEmbed::drop(ptr: usize) +pub unsafe fn skyfeed::ImageEmbed::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::ImageEmbed impl tracing::instrument::Instrument for skyfeed::ImageEmbed impl tracing::instrument::WithSubscriber for skyfeed::ImageEmbed @@ -385,6 +475,10 @@ impl core::marker::Sync for skyfeed::Post impl core::marker::Unpin for skyfeed::Post impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Post impl core::panic::unwind_safe::UnwindSafe for skyfeed::Post +impl atrium_common::types::throttled::Throttleable

for skyfeed::Post where P: core::default::Default +pub fn skyfeed::Post::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::Post +pub fn skyfeed::Post::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Post where U: core::convert::From pub fn skyfeed::Post::into(self) -> U impl core::convert::TryFrom for skyfeed::Post where U: core::convert::Into @@ -407,6 +501,13 @@ impl core::clone::CloneToUninit for skyfeed::Post where T: core::clone::Clone pub unsafe fn skyfeed::Post::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Post pub fn skyfeed::Post::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Post +pub type skyfeed::Post::Init = T +pub const skyfeed::Post::ALIGN: usize +pub unsafe fn skyfeed::Post::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Post::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Post::drop(ptr: usize) +pub unsafe fn skyfeed::Post::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Post impl tracing::instrument::Instrument for skyfeed::Post impl tracing::instrument::WithSubscriber for skyfeed::Post @@ -428,6 +529,10 @@ impl core::marker::Sync for skyfeed::QuoteEmbed impl core::marker::Unpin for skyfeed::QuoteEmbed impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::QuoteEmbed impl core::panic::unwind_safe::UnwindSafe for skyfeed::QuoteEmbed +impl atrium_common::types::throttled::Throttleable

for skyfeed::QuoteEmbed where P: core::default::Default +pub fn skyfeed::QuoteEmbed::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::QuoteEmbed +pub fn skyfeed::QuoteEmbed::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::QuoteEmbed where U: core::convert::From pub fn skyfeed::QuoteEmbed::into(self) -> U impl core::convert::TryFrom for skyfeed::QuoteEmbed where U: core::convert::Into @@ -450,6 +555,13 @@ impl core::clone::CloneToUninit for skyfeed::QuoteEmbed where T: core::clone: pub unsafe fn skyfeed::QuoteEmbed::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::QuoteEmbed pub fn skyfeed::QuoteEmbed::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::QuoteEmbed +pub type skyfeed::QuoteEmbed::Init = T +pub const skyfeed::QuoteEmbed::ALIGN: usize +pub unsafe fn skyfeed::QuoteEmbed::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::QuoteEmbed::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::QuoteEmbed::drop(ptr: usize) +pub unsafe fn skyfeed::QuoteEmbed::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::QuoteEmbed impl tracing::instrument::Instrument for skyfeed::QuoteEmbed impl tracing::instrument::WithSubscriber for skyfeed::QuoteEmbed @@ -461,7 +573,7 @@ pub fn skyfeed::QuoteEmbed::vzip(self) -> V pub struct skyfeed::Request pub skyfeed::Request::cursor: core::option::Option pub skyfeed::Request::feed: alloc::string::String -pub skyfeed::Request::limit: core::option::Option> +pub skyfeed::Request::limit: core::option::Option impl core::clone::Clone for skyfeed::Request pub fn skyfeed::Request::clone(&self) -> skyfeed::Request impl core::fmt::Debug for skyfeed::Request @@ -472,6 +584,10 @@ impl core::marker::Sync for skyfeed::Request impl core::marker::Unpin for skyfeed::Request impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Request impl core::panic::unwind_safe::UnwindSafe for skyfeed::Request +impl atrium_common::types::throttled::Throttleable

for skyfeed::Request where P: core::default::Default +pub fn skyfeed::Request::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::Request +pub fn skyfeed::Request::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Request where U: core::convert::From pub fn skyfeed::Request::into(self) -> U impl core::convert::TryFrom for skyfeed::Request where U: core::convert::Into @@ -494,6 +610,13 @@ impl core::clone::CloneToUninit for skyfeed::Request where T: core::clone::Cl pub unsafe fn skyfeed::Request::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Request pub fn skyfeed::Request::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Request +pub type skyfeed::Request::Init = T +pub const skyfeed::Request::ALIGN: usize +pub unsafe fn skyfeed::Request::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Request::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Request::drop(ptr: usize) +pub unsafe fn skyfeed::Request::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Request impl tracing::instrument::Instrument for skyfeed::Request impl tracing::instrument::WithSubscriber for skyfeed::Request @@ -519,10 +642,16 @@ impl core::marker::Sync for skyfeed::Uri impl core::marker::Unpin for skyfeed::Uri impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::Uri impl core::panic::unwind_safe::UnwindSafe for skyfeed::Uri +impl atrium_common::types::throttled::Throttleable

for skyfeed::Uri where P: core::default::Default +pub fn skyfeed::Uri::throttled(self) -> atrium_common::types::throttled::Throttled impl equivalent::Equivalent for skyfeed::Uri where Q: core::cmp::Eq + ?core::marker::Sized, K: core::borrow::Borrow + ?core::marker::Sized pub fn skyfeed::Uri::equivalent(&self, key: &K) -> bool impl hashbrown::Equivalent for skyfeed::Uri where Q: core::cmp::Eq + ?core::marker::Sized, K: core::borrow::Borrow + ?core::marker::Sized +impl hashbrown::Equivalent for skyfeed::Uri where Q: core::cmp::Eq + ?core::marker::Sized, K: core::borrow::Borrow + ?core::marker::Sized +pub fn skyfeed::Uri::equivalent(&self, key: &K) -> bool pub fn skyfeed::Uri::equivalent(&self, key: &K) -> bool +impl atrium_common::types::cached::Cacheable for skyfeed::Uri +pub fn skyfeed::Uri::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::Uri where U: core::convert::From pub fn skyfeed::Uri::into(self) -> U impl core::convert::TryFrom for skyfeed::Uri where U: core::convert::Into @@ -545,6 +674,13 @@ impl core::clone::CloneToUninit for skyfeed::Uri where T: core::clone::Clone pub unsafe fn skyfeed::Uri::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::Uri pub fn skyfeed::Uri::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::Uri +pub type skyfeed::Uri::Init = T +pub const skyfeed::Uri::ALIGN: usize +pub unsafe fn skyfeed::Uri::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::Uri::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::Uri::drop(ptr: usize) +pub unsafe fn skyfeed::Uri::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::Uri impl tracing::instrument::Instrument for skyfeed::Uri impl tracing::instrument::WithSubscriber for skyfeed::Uri @@ -566,6 +702,10 @@ impl core::marker::Sync for skyfeed::VideoEmbed impl core::marker::Unpin for skyfeed::VideoEmbed impl core::panic::unwind_safe::RefUnwindSafe for skyfeed::VideoEmbed impl core::panic::unwind_safe::UnwindSafe for skyfeed::VideoEmbed +impl atrium_common::types::throttled::Throttleable

for skyfeed::VideoEmbed where P: core::default::Default +pub fn skyfeed::VideoEmbed::throttled(self) -> atrium_common::types::throttled::Throttled +impl atrium_common::types::cached::Cacheable for skyfeed::VideoEmbed +pub fn skyfeed::VideoEmbed::cached(self, cache: C) -> atrium_common::types::cached::Cached impl core::convert::Into for skyfeed::VideoEmbed where U: core::convert::From pub fn skyfeed::VideoEmbed::into(self) -> U impl core::convert::TryFrom for skyfeed::VideoEmbed where U: core::convert::Into @@ -588,6 +728,13 @@ impl core::clone::CloneToUninit for skyfeed::VideoEmbed where T: core::clone: pub unsafe fn skyfeed::VideoEmbed::clone_to_uninit(&self, dst: *mut u8) impl core::convert::From for skyfeed::VideoEmbed pub fn skyfeed::VideoEmbed::from(t: T) -> T +impl crossbeam_epoch::atomic::Pointable for skyfeed::VideoEmbed +pub type skyfeed::VideoEmbed::Init = T +pub const skyfeed::VideoEmbed::ALIGN: usize +pub unsafe fn skyfeed::VideoEmbed::deref<'a>(ptr: usize) -> &'a T +pub unsafe fn skyfeed::VideoEmbed::deref_mut<'a>(ptr: usize) -> &'a mut T +pub unsafe fn skyfeed::VideoEmbed::drop(ptr: usize) +pub unsafe fn skyfeed::VideoEmbed::init(init: ::Init) -> usize impl icu_provider::any::MaybeSendSync for skyfeed::VideoEmbed impl tracing::instrument::Instrument for skyfeed::VideoEmbed impl tracing::instrument::WithSubscriber for skyfeed::VideoEmbed From 80eb6b1aada6b1cf1f506eedee11ea297be95c2e Mon Sep 17 00:00:00 2001 From: cyypherus Date: Fri, 4 Apr 2025 11:27:13 -0600 Subject: [PATCH 4/4] clippy --- src/feed.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feed.rs b/src/feed.rs index f743bcd..7901096 100644 --- a/src/feed.rs +++ b/src/feed.rs @@ -283,7 +283,7 @@ async fn get_feed_skeleton( .serve_feed(Request { cursor: query.cursor.clone(), feed: query.feed.clone(), - limit: query.limit.map(|l| u8::from(l)), + limit: query.limit.map(u8::from), }) .await; Ok::(warp::reply::json(&FeedSkeleton {