From 42042e5d44b53bf7a84153f528596badcc019c65 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 5 Oct 2021 12:03:25 +0200 Subject: [PATCH] updte doku to 0.10 --- Cargo.lock | 6 ++++-- Cargo.toml | 2 +- crates/utils/Cargo.toml | 2 +- crates/utils/src/settings/structs.rs | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22504d82d..fd738133c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1003,7 +1003,8 @@ checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd" [[package]] name = "doku" version = "0.10.0" -source = "git+https://github.com/anixe/doku?branch=v0.10#7397e8fac5cd08585b87546a768903365fa8b8c8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fca50a9496056845256b66d59cca4bbac18ff6dd6c1922de55aa70786be3a2d4" dependencies = [ "doku-derive", "serde", @@ -1012,7 +1013,8 @@ dependencies = [ [[package]] name = "doku-derive" version = "0.10.0" -source = "git+https://github.com/anixe/doku?branch=v0.10#7397e8fac5cd08585b87546a768903365fa8b8c8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dc9bda49ecdf58ce2c6aa09cfe0b627f8af3c3e3d6480f472aa1e8e3fd27fb" dependencies = [ "darling 0.13.0", "proc-macro-error", diff --git a/Cargo.toml b/Cargo.toml index 9d6f4a8a4..7da1f9280 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,7 @@ activitystreams = "0.7.0-alpha.11" actix-rt = { version = "2.2.0", default-features = false } serde_json = { version = "1.0.68", features = ["preserve_order"] } clokwerk = "0.3.5" -doku = { git = "https://github.com/anixe/doku", branch = "v0.10" } +doku = "0.10" [dev-dependencies.cargo-husky] version = "1.5.0" diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 759b0924e..427aeaf24 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -39,4 +39,4 @@ deser-hjson = "1.0.2" smart-default = "0.6.0" webpage = { version = "1.3.0", default-features = false, features = ["serde"] } jsonwebtoken = "7.2.0" -doku = { git = "https://github.com/anixe/doku", branch = "v0.10" } +doku = "0.10" diff --git a/crates/utils/src/settings/structs.rs b/crates/utils/src/settings/structs.rs index 2246cfc0c..4ec17906b 100644 --- a/crates/utils/src/settings/structs.rs +++ b/crates/utils/src/settings/structs.rs @@ -1,4 +1,4 @@ -use doku::prelude::*; +use doku::Document; use serde::{Deserialize, Serialize}; use std::net::{IpAddr, Ipv4Addr}; @@ -109,7 +109,8 @@ pub struct FederationConfig { /// /// list of instances with which federation is allowed #[default(None)] - #[doku(example = "[\"instance1.tld\",\"instance2.tld\"]")] + #[doku(example = "instance1.tld")] + #[doku(example = "instance2.tld")] pub allowed_instances: Option>, /// Instances which we never federate anything with (but previously federated objects are unaffected) #[default(None)]