mirror of
https://github.com/dathere/ckanaction.git
synced 2025-12-27 21:27:01 +00:00
lint: cargo fmt + cargo clippy
This commit is contained in:
parent
809948b8f4
commit
beb267d5b5
2 changed files with 43 additions and 37 deletions
72
src/lib.rs
72
src/lib.rs
|
|
@ -1114,15 +1114,15 @@ impl CKAN {
|
||||||
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
||||||
opsert("groups", groups, &mut map);
|
opsert("groups", groups, &mut map);
|
||||||
opsert("owner_org", owner_org, &mut map);
|
opsert("owner_org", owner_org, &mut map);
|
||||||
if let Some(custom) = custom_fields {
|
if let Some(custom) = custom_fields
|
||||||
if custom.is_object() {
|
&& custom.is_object()
|
||||||
let custom_temp_map = custom.as_object().unwrap();
|
{
|
||||||
custom_map.extend(
|
let custom_temp_map = custom.as_object().unwrap();
|
||||||
custom_temp_map
|
custom_map.extend(
|
||||||
.iter()
|
custom_temp_map
|
||||||
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
.iter()
|
||||||
);
|
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
||||||
}
|
);
|
||||||
}
|
}
|
||||||
map.extend(
|
map.extend(
|
||||||
custom_map
|
custom_map
|
||||||
|
|
@ -1660,15 +1660,15 @@ impl CKAN {
|
||||||
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
||||||
opsert("groups", groups, &mut map);
|
opsert("groups", groups, &mut map);
|
||||||
opsert("owner_org", owner_org, &mut map);
|
opsert("owner_org", owner_org, &mut map);
|
||||||
if let Some(custom) = custom_fields {
|
if let Some(custom) = custom_fields
|
||||||
if custom.is_object() {
|
&& custom.is_object()
|
||||||
let custom_temp_map = custom.as_object().unwrap();
|
{
|
||||||
custom_map.extend(
|
let custom_temp_map = custom.as_object().unwrap();
|
||||||
custom_temp_map
|
custom_map.extend(
|
||||||
.iter()
|
custom_temp_map
|
||||||
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
.iter()
|
||||||
);
|
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
||||||
}
|
);
|
||||||
}
|
}
|
||||||
map.extend(
|
map.extend(
|
||||||
custom_map
|
custom_map
|
||||||
|
|
@ -1984,15 +1984,15 @@ impl CKAN {
|
||||||
let endpoint = self.url.clone() + "/api/3/action/config_option_update";
|
let endpoint = self.url.clone() + "/api/3/action/config_option_update";
|
||||||
let mut map: HashMap<&str, serde_json::Value> = HashMap::new();
|
let mut map: HashMap<&str, serde_json::Value> = HashMap::new();
|
||||||
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
||||||
if let Some(options_obj) = options {
|
if let Some(options_obj) = options
|
||||||
if options_obj.is_object() {
|
&& options_obj.is_object()
|
||||||
let custom_temp_map = options_obj.as_object().unwrap();
|
{
|
||||||
custom_map.extend(
|
let custom_temp_map = options_obj.as_object().unwrap();
|
||||||
custom_temp_map
|
custom_map.extend(
|
||||||
.iter()
|
custom_temp_map
|
||||||
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
.iter()
|
||||||
);
|
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
||||||
}
|
);
|
||||||
}
|
}
|
||||||
map.extend(
|
map.extend(
|
||||||
custom_map
|
custom_map
|
||||||
|
|
@ -2060,15 +2060,15 @@ impl CKAN {
|
||||||
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
let mut custom_map: HashMap<String, serde_json::Value> = HashMap::new();
|
||||||
opsert("groups", groups, &mut map);
|
opsert("groups", groups, &mut map);
|
||||||
opsert("owner_org", owner_org, &mut map);
|
opsert("owner_org", owner_org, &mut map);
|
||||||
if let Some(custom) = custom_fields {
|
if let Some(custom) = custom_fields
|
||||||
if custom.is_object() {
|
&& custom.is_object()
|
||||||
let custom_temp_map = custom.as_object().unwrap();
|
{
|
||||||
custom_map.extend(
|
let custom_temp_map = custom.as_object().unwrap();
|
||||||
custom_temp_map
|
custom_map.extend(
|
||||||
.iter()
|
custom_temp_map
|
||||||
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
.iter()
|
||||||
);
|
.map(|item| (item.0.to_owned(), item.1.to_owned())),
|
||||||
}
|
);
|
||||||
}
|
}
|
||||||
map.extend(
|
map.extend(
|
||||||
custom_map
|
custom_map
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,13 @@ mod tests {
|
||||||
let ckan = get_ckan_builder().await;
|
let ckan = get_ckan_builder().await;
|
||||||
let response = ckan.status_show().await?;
|
let response = ckan.status_show().await?;
|
||||||
assert!(response.is_object());
|
assert!(response.is_object());
|
||||||
let success = response.as_object().unwrap().get("success").unwrap().as_bool().unwrap();
|
let success = response
|
||||||
|
.as_object()
|
||||||
|
.unwrap()
|
||||||
|
.get("success")
|
||||||
|
.unwrap()
|
||||||
|
.as_bool()
|
||||||
|
.unwrap();
|
||||||
assert!(success);
|
assert!(success);
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue