yerba 0.9.1-arm-linux-gnu → 0.10.0-arm-linux-gnu

data/rust/src/document/unique.rs

@@ -11,12 +11,12 @@ pub struct DuplicateInfo {
 }
 
 impl Document {
-  pub fn unique(&mut self, dot_path: &str, by: &str, remove: bool) -> Result<Vec<DuplicateInfo>, YerbaError> {
-    self.unique_with_options(dot_path, by, remove, false)
+  pub fn unique(&mut self, selector: &str, by: &str, remove: bool) -> Result<Vec<DuplicateInfo>, YerbaError> {
+    self.unique_with_options(selector, by, remove, false)
   }
 
-  pub fn unique_with_options(&mut self, dot_path: &str, by: &str, remove: bool, allow_blank_duplicates: bool) -> Result<Vec<DuplicateInfo>, YerbaError> {
-    let current_node = self.navigate(dot_path)?;
+  pub fn unique_with_options(&mut self, selector: &str, by: &str, remove: bool, allow_blank_duplicates: bool) -> Result<Vec<DuplicateInfo>, YerbaError> {
+    let current_node = self.navigate(selector)?;
     let source = self.source_text();
 
     let sequence = match find_block_sequence(&current_node) {
@@ -76,7 +76,7 @@ impl Document {
 
     if remove && !duplicate_indices.is_empty() {
       for &index in duplicate_indices.iter().rev() {
-        self.remove_at(dot_path, index)?;
+        self.remove_at(selector, index)?;
       }
     }
 

data/rust/src/error.rs

@@ -27,13 +27,13 @@ impl std::fmt::Display for YerbaError {
       YerbaError::ParseError(msg) => write!(f, "parse error: {}", msg),
       YerbaError::IoError(err) => write!(f, "io error: {}", err),
       YerbaError::SelectorNotFound(selector) => write!(f, "selector not found: {}", selector),
-      YerbaError::NotASequence(path) => write!(f, "not a sequence: {}", path),
+      YerbaError::NotASequence(selector) => write!(f, "not a sequence: {}", selector),
 
-      YerbaError::FlowCollectionNotWritable(path) => {
+      YerbaError::FlowCollectionNotWritable(selector) => {
         write!(
           f,
           "cannot write to \"{}\": flow collections are not writable yet. Convert it to block style first, with `collection_style` or `yerba collection-style`",
-          path
+          selector
         )
       }
 
@@ -170,7 +170,11 @@ impl GitHubAnnotations for YerbaError {
           level: "error ",
           file: file.to_string(),
           line: Some(control.line),
-          message: format!("control character U+{:04X} at column {}", control.character as u32, control.column),
+          message: format!(
+            "control character U+{:04X} at column {}",
+            control.character as u32,
+            control.character_column + 1
+          ),
         })
         .collect(),