style(cognitarium): little coup de polish

axone-protocol · Nov 2, 2023 · cc94b6d · cc94b6d
1 parent 70ba5a8
commit cc94b6d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/contracts/okp4-cognitarium/Cargo.toml b/contracts/okp4-cognitarium/Cargo.toml
@@ -35,10 +35,10 @@ cosmwasm-storage.workspace = true
 cw-storage-plus.workspace = true
 cw2.workspace = true
 derive_builder = "0.12.0"
+either = "1.9.0"
 rio_api = "0.8.4"
 rio_turtle = "0.8.4"
 rio_xml = "0.8.4"
-either = "1.9.0"
 schemars.workspace = true
 serde.workspace = true
 thiserror.workspace = true

diff --git a/contracts/okp4-cognitarium/src/contract.rs b/contracts/okp4-cognitarium/src/contract.rs
@@ -233,13 +233,13 @@ pub mod query {
         let out: Vec<u8> = Vec::default();
         let mut writer = TripleWriter::new(&format, out);
 
-        for atom in atoms {
-            let rdf_triple = (&atom).into();
+        for atom in &atoms {
+            let triple = atom.into();
 
-            writer.write(&rdf_triple).map_err(|e| {
+            writer.write(&triple).map_err(|e| {
                 StdError::serialize_err(
                     "triple",
-                    format!("Error writing triple {}: {}", &rdf_triple, e),
+                    format!("Error writing triple {}: {}", &triple, e),
                 )
             })?;
         }
@@ -287,12 +287,12 @@ pub mod query {
         let out: Vec<u8> = Vec::default();
         let mut writer = TripleWriter::new(&format, out);
 
-        for atom in atoms {
-            let rdf_triple = (&atom).into();
-            writer.write(&rdf_triple).map_err(|e| {
+        for atom in &atoms {
+            let triple = atom.into();
+            writer.write(&triple).map_err(|e| {
                 StdError::serialize_err(
                     "triple",
-                    format!("Error writing triple {}: {}", &rdf_triple, e),
+                    format!("Error writing triple {}: {}", &triple, e),
                 )
             })?;
         }
@@ -352,7 +352,7 @@ pub mod util {
                 .into_iter()
                 .map(|(name, var)| -> StdResult<(String, Value)> {
                     Ok((
-                        name.clone(),
+                        name,
                         var.as_value(&mut |ns_key| {
                             let res = ns_resolver.resolve_from_key(deps.storage, ns_key);
                             res.and_then(NamespaceResolver::none_as_error_middleware)

diff --git a/contracts/okp4-cognitarium/src/querier/engine.rs b/contracts/okp4-cognitarium/src/querier/engine.rs
@@ -31,7 +31,7 @@ impl<'a> QueryEngine<'a> {
         &'a self,
         plan: QueryPlan,
         selection: Vec<SelectItem>,
-    ) -> StdResult<SelectResults> {
+    ) -> StdResult<SelectResults<'_>> {
         let bindings = selection
             .iter()
             .map(|item| match item {
@@ -538,7 +538,7 @@ impl TripleTemplate {
         let subject = match Self::resolve_triple_term(
             &self.subject,
             ResolvedVariable::as_subject,
-            &vars,
+            vars,
             "subject",
         )? {
             Some(s) => s,
@@ -548,7 +548,7 @@ impl TripleTemplate {
         let predicate = match Self::resolve_triple_term(
             &self.predicate,
             ResolvedVariable::as_predicate,
-            &vars,
+            vars,
             "predicate",
         )? {
             Some(p) => p,
@@ -558,17 +558,17 @@ impl TripleTemplate {
         let object = match Self::resolve_triple_term(
             &self.object,
             ResolvedVariable::as_object,
-            &vars,
+            vars,
             "object",
         )? {
             Some(o) => o,
             None => return Ok(None),
         };
 
         Ok(Some(Triple {
-            subject: subject.clone(),
-            predicate: predicate.clone(),
-            object: object.clone(),
+            subject,
+            predicate,
+            object,
         }))
     }
 

diff --git a/contracts/okp4-cognitarium/src/storer/engine.rs b/contracts/okp4-cognitarium/src/storer/engine.rs
@@ -124,7 +124,7 @@ impl<'a> StoreEngine<'a> {
             )
             .map_err(ContractError::Std)?;
 
-        if let Some(_) = old {
+        if old.is_some() {
             triples().replace(
                 self.storage,
                 (
@@ -246,7 +246,7 @@ impl<'a> StoreEngine<'a> {
 
     fn subject_size(&mut self, subject: &Subject) -> StdResult<usize> {
         match subject {
-            Subject::Named(n) => self.node_size(&n),
+            Subject::Named(n) => self.node_size(n),
             Subject::Blank(n) => Ok(n.len()),
         }
     }