Fix merge conflict

src/api/policies/instance/instance.rs

@@ -1,41 +1,37 @@
-pub mod instance {
+use reqwest::Client;
-    use reqwest::Client;
+use serde_json::from_str;
-    use serde_json::from_str;
 
-    use crate::errors::InstanceServerError;
+use crate::errors::InstanceServerError;
-    use crate::{api::types::InstancePolicies, instance::Instance};
+use crate::{api::types::InstancePolicies, instance::Instance};
 
-    impl<'a> Instance<'a> {
+impl<'a> Instance<'a> {
-        /**
+    /**
-        Gets the instance policies schema.
+    Gets the instance policies schema.
-        # 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,
+        let client = Client::new();
-        ) -> Result<InstancePolicies, InstanceServerError> {
+        let endpoint_url = self.urls.get_api().to_string() + "/policies/instance/";
-            let client = Client::new();
+        let request = match client.get(&endpoint_url).send().await {
-            let endpoint_url = self.urls.get_api().to_string() + "/policies/instance/";
+            Ok(result) => result,
-            let request = match client.get(&endpoint_url).send().await {
+            Err(e) => {
-                Ok(result) => result,
+                return Err(InstanceServerError::RequestErrorError {
-                Err(e) => {
+                    url: endpoint_url,
-                    return Err(InstanceServerError::RequestErrorError {
+                    error: e.to_string(),
-                        url: endpoint_url,
-                        error: e.to_string(),
-                    });
-                }
-            };
-
-            if !request.status().as_str().starts_with('2') {
-                return Err(InstanceServerError::ReceivedErrorCodeError {
-                    error_code: request.status().to_string(),
                 });
             }
+        };
 
-            let body = request.text().await.unwrap();
+        if !request.status().as_str().starts_with('2') {
-            let instance_policies_schema: InstancePolicies = from_str(&body).unwrap();
+            return Err(InstanceServerError::ReceivedErrorCodeError {
-            Ok(instance_policies_schema)
+                error_code: request.status().to_string(),
+            });
         }
+
+        let body = request.text().await.unwrap();
+        let instance_policies_schema: InstancePolicies = from_str(&body).unwrap();
+        Ok(instance_policies_schema)
     }
 }
 
@@ -58,4 +54,4 @@ mod instance_policies_schema_test {
         let schema = test_instance.instance_policies_schema().await.unwrap();
         println!("{:?}", schema);
     }
-}
+}