Fix merge conflict
This commit is contained in:
parent
b4888d2f70
commit
0fd7be51a8
|
@ -1,4 +1,3 @@
|
||||||
pub mod instance {
|
|
||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
use serde_json::from_str;
|
use serde_json::from_str;
|
||||||
|
|
||||||
|
@ -11,9 +10,7 @@ pub mod instance {
|
||||||
# Errors
|
# Errors
|
||||||
[`InstanceServerError`] - If the request fails.
|
[`InstanceServerError`] - If the request fails.
|
||||||
*/
|
*/
|
||||||
pub async fn instance_policies_schema(
|
pub async fn instance_policies_schema(&self) -> Result<InstancePolicies, InstanceServerError> {
|
||||||
&self,
|
|
||||||
) -> Result<InstancePolicies, InstanceServerError> {
|
|
||||||
let client = Client::new();
|
let client = Client::new();
|
||||||
let endpoint_url = self.urls.get_api().to_string() + "/policies/instance/";
|
let endpoint_url = self.urls.get_api().to_string() + "/policies/instance/";
|
||||||
let request = match client.get(&endpoint_url).send().await {
|
let request = match client.get(&endpoint_url).send().await {
|
||||||
|
@ -37,7 +34,6 @@ pub mod instance {
|
||||||
Ok(instance_policies_schema)
|
Ok(instance_policies_schema)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod instance_policies_schema_test {
|
mod instance_policies_schema_test {
|
||||||
|
|
Loading…
Reference in New Issue