chore: moved fn below
This commit is contained in:
parent
1fdd40a68e
commit
26d996fbf9
1 changed files with 25 additions and 25 deletions
|
@ -28,31 +28,6 @@ pub struct Endpoint {
|
||||||
pub extract: Option<StringOr<Extractor>>,
|
pub extract: Option<StringOr<Extractor>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn replace_recursive(element: toml::Value, from: &str, to: &str) -> toml::Value {
|
|
||||||
match element {
|
|
||||||
toml::Value::Float(x) => toml::Value::Float(x),
|
|
||||||
toml::Value::Integer(x) => toml::Value::Integer(x),
|
|
||||||
toml::Value::Boolean(x) => toml::Value::Boolean(x),
|
|
||||||
toml::Value::Datetime(x) => toml::Value::Datetime(x),
|
|
||||||
toml::Value::String(x) => toml::Value::String(x.replace(from, to)),
|
|
||||||
toml::Value::Array(x) => toml::Value::Array(
|
|
||||||
x.into_iter().map(|x| replace_recursive(x, from, to)).collect()
|
|
||||||
),
|
|
||||||
toml::Value::Table(map) => {
|
|
||||||
let mut out = toml::map::Map::new();
|
|
||||||
for (k, v) in map {
|
|
||||||
let new_v = replace_recursive(v.clone(), from, to);
|
|
||||||
if k.contains(from) {
|
|
||||||
out.insert(k.replace(from, to), new_v);
|
|
||||||
} else {
|
|
||||||
out.insert(k.to_string(), new_v);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
toml::Value::Table(out)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Endpoint {
|
impl Endpoint {
|
||||||
pub fn fill(mut self, env: &toml::Table) -> Self {
|
pub fn fill(mut self, env: &toml::Table) -> Self {
|
||||||
let mut vars: HashMap<String, String> = HashMap::default();
|
let mut vars: HashMap<String, String> = HashMap::default();
|
||||||
|
@ -183,6 +158,31 @@ impl Endpoint {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn replace_recursive(element: toml::Value, from: &str, to: &str) -> toml::Value {
|
||||||
|
match element {
|
||||||
|
toml::Value::Float(x) => toml::Value::Float(x),
|
||||||
|
toml::Value::Integer(x) => toml::Value::Integer(x),
|
||||||
|
toml::Value::Boolean(x) => toml::Value::Boolean(x),
|
||||||
|
toml::Value::Datetime(x) => toml::Value::Datetime(x),
|
||||||
|
toml::Value::String(x) => toml::Value::String(x.replace(from, to)),
|
||||||
|
toml::Value::Array(x) => toml::Value::Array(
|
||||||
|
x.into_iter().map(|x| replace_recursive(x, from, to)).collect()
|
||||||
|
),
|
||||||
|
toml::Value::Table(map) => {
|
||||||
|
let mut out = toml::map::Map::new();
|
||||||
|
for (k, v) in map {
|
||||||
|
let new_v = replace_recursive(v.clone(), from, to);
|
||||||
|
if k.contains(from) {
|
||||||
|
out.insert(k.replace(from, to), new_v);
|
||||||
|
} else {
|
||||||
|
out.insert(k.to_string(), new_v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
toml::Value::Table(out)
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async fn format_body(res: reqwest::Response) -> Result<String, PostWomanError> {
|
async fn format_body(res: reqwest::Response) -> Result<String, PostWomanError> {
|
||||||
match res.headers().get("Content-Type") {
|
match res.headers().get("Content-Type") {
|
||||||
None => Ok(res.text().await? + "\n"),
|
None => Ok(res.text().await? + "\n"),
|
||||||
|
|
Loading…
Reference in a new issue