[ref] json-pest-parser: remove block occurrences

lib/tools/json-pest-parser/src/lib.rs

@@ -231,10 +231,10 @@ fn parse_value<S: std::hash::BuildHasher + Default>(pair: Pair<Rule>) -> JSONVal
 }
 
 pub fn get_optional_usize<S: std::hash::BuildHasher>(
-    json_block: &HashMap<&str, JSONValue<S>, S>,
+    json_object: &HashMap<&str, JSONValue<S>, S>,
     field: &str,
 ) -> Result<Option<usize>, Error> {
-    Ok(match json_block.get(field) {
+    Ok(match json_object.get(field) {
         Some(value) => {
             if !value.is_null() {
                 Some(
@@ -257,10 +257,10 @@ pub fn get_optional_usize<S: std::hash::BuildHasher>(
 }
 
 pub fn get_optional_str_not_empty<'a, S: std::hash::BuildHasher>(
-    json_block: &'a HashMap<&str, JSONValue<S>, S>,
+    json_object: &'a HashMap<&str, JSONValue<S>, S>,
     field: &str,
 ) -> Result<Option<&'a str>, Error> {
-    let result = get_optional_str(json_block, field);
+    let result = get_optional_str(json_object, field);
     if let Ok(Some(value)) = result {
         if !value.is_empty() {
             Ok(Some(value))
@@ -273,10 +273,10 @@ pub fn get_optional_str_not_empty<'a, S: std::hash::BuildHasher>(
 }
 
 pub fn get_optional_str<'a, S: std::hash::BuildHasher>(
-    json_block: &'a HashMap<&str, JSONValue<S>, S>,
+    json_object: &'a HashMap<&str, JSONValue<S>, S>,
     field: &str,
 ) -> Result<Option<&'a str>, Error> {
-    Ok(match json_block.get(field) {
+    Ok(match json_object.get(field) {
         Some(value) => {
             if !value.is_null() {
                 Some(value.to_str().ok_or_else(|| ParseJsonError {
@@ -291,10 +291,10 @@ pub fn get_optional_str<'a, S: std::hash::BuildHasher>(
 }
 
 pub fn get_number<S: std::hash::BuildHasher>(
-    json_block: &HashMap<&str, JSONValue<S>, S>,
+    json_object: &HashMap<&str, JSONValue<S>, S>,
     field: &str,
 ) -> Result<f64, Error> {
-    Ok(json_block
+    Ok(json_object
         .get(field)
         .ok_or_else(|| ParseJsonError {
             cause: format!("Fail to parse json : field '{}' must exist !", field),
@@ -306,10 +306,10 @@ pub fn get_number<S: std::hash::BuildHasher>(
 }
 
 pub fn get_str<'a, S: std::hash::BuildHasher>(
-    json_block: &'a HashMap<&str, JSONValue<S>, S>,
+    json_object: &'a HashMap<&str, JSONValue<S>, S>,
     field: &str,
 ) -> Result<&'a str, Error> {
-    Ok(json_block
+    Ok(json_object
         .get(field)
         .ok_or_else(|| ParseJsonError {
             cause: format!("Fail to parse json : field '{}' must exist !", field),
@@ -321,10 +321,10 @@ pub fn get_str<'a, S: std::hash::BuildHasher>(
 }
 
 pub fn get_str_array<'a, S: std::hash::BuildHasher>(
-    json_block: &'a HashMap<&str, JSONValue<S>, S>,
+    json_object: &'a HashMap<&str, JSONValue<S>, S>,
     field: &str,
 ) -> Result<Vec<&'a str>, ParseJsonError> {
-    json_block
+    json_object
         .get(field)
         .ok_or_else(|| ParseJsonError {
             cause: format!("Fail to parse json : field '{}' must exist !", field),
@@ -346,10 +346,10 @@ pub fn get_str_array<'a, S: std::hash::BuildHasher>(
 }
 
 pub fn get_object_array<'a, S: std::hash::BuildHasher>(
-    json_block: &'a JsonObject<'a, S>,
+    json_object: &'a JsonObject<'a, S>,
     field: &str,
 ) -> Result<Vec<&'a JsonObject<'a, S>>, ParseJsonError> {
-    json_block
+    json_object
         .get(field)
         .ok_or_else(|| ParseJsonError {
             cause: format!("Fail to parse json : field '{}' must exist !", field),