Remove HeaderError from the pub api and hide it.

Author: ratmice

cfgrammar/src/lib/header.rs

@@ -16,6 +16,7 @@ use std::{error::Error, fmt};
 /// * An error during parsing the section.
 /// * An error resulting from a value in the section having an invalid value.
 #[derive(Debug, Clone)]
+#[doc(hidden)]
 pub struct HeaderError<T> {
     pub kind: HeaderErrorKind,
     pub locations: Vec<T>,

cfgrammar/src/lib/yacc/ast.rs

@@ -73,13 +73,15 @@ impl ASTWithValidityInfo {
 }
 
 impl FromStr for ASTWithValidityInfo {
-    type Err = Vec<HeaderError<Span>>;
+    type Err = Vec<YaccGrammarError>;
     /// Parses the `%grmtools section` expecting it to contain a `yacckind` entry.
-    fn from_str(src: &str) -> Result<Self, Vec<HeaderError<Span>>> {
+    fn from_str(src: &str) -> Result<Self, Vec<YaccGrammarError>> {
         let mut errs = Vec::new();
-        let (header, _) = GrmtoolsSectionParser::new(src, true).parse()?;
+        let (header, _) = GrmtoolsSectionParser::new(src, true)
+            .parse()
+            .map_err(|mut errs| errs.drain(..).map(|e| e.into()).collect::<Vec<_>>())?;
         if let Some(HeaderValue(_, yk_val)) = header.get("yacckind") {
-            let yacc_kind = YaccKind::try_from(yk_val).map_err(|e| vec![e])?;
+            let yacc_kind = YaccKind::try_from(yk_val).map_err(|e| vec![e.into()])?;
             let ast = {
                 // We don't want to strip off the header so that span's will be correct.
                 let mut yp = YaccParser::new(yacc_kind, src);
@@ -96,8 +98,9 @@ impl FromStr for ASTWithValidityInfo {
         } else {
             Err(vec![HeaderError {
                 kind: HeaderErrorKind::InvalidEntry("yacckind"),
-                locations: vec![],
-            }])
+                locations: vec![Span::new(0, 0)],
+            }
+            .into()])
         }
     }
 }

cfgrammar/src/lib/yacc/grammar.rs

@@ -193,8 +193,7 @@ where
 {
     type Err = Vec<YaccGrammarError>;
     fn from_str(s: &str) -> YaccGrammarResult<Self> {
-        let ast_validation = ast::ASTWithValidityInfo::from_str(s)
-            .map_err(|mut errs| errs.drain(..).map(|e| e.into()).collect::<Vec<_>>())?;
+        let ast_validation = ast::ASTWithValidityInfo::from_str(s)?;
         Self::new_from_ast_with_validity_info(&ast_validation)
     }
 }