feat: impl Iterator for errors

fixes #139

ast.errors() now return an `Iter<'_, Error>` which allows us to iterate, but also check for the `len()`. It should allow us to use `is_empty()` as well eventually, if / when rust-lang/rust#35428 lands.

Author: o0Ignition0o

crates/apollo-parser/README.md

@@ -62,8 +62,8 @@ fn main() {
     let parser = Parser::new(input);
     let ast = parser.parse();
 
-    // ast.errors() returns an errors slice encountered during lexing and parsing
-    assert!(ast.errors().is_empty());
+    // ast.errors() returns an iterator with the errors encountered during lexing and parsing
+    assert_eq!(0, ast.errors().len());
 
     // ast.document() get the Document, or root node, of the tree that you can
     // start iterating on.
@@ -97,7 +97,7 @@ fn main() {
     ";
     let parser = Parser::new(input);
     let ast = parser.parse();
-    assert!(ast.errors().is_empty());
+    assert_eq!(0, ast.errors().len());
 
     let doc = ast.document();
 
@@ -130,7 +130,7 @@ fn main() {
 
     let parser = Parser::new(input);
     let ast = parser.parse();
-    assert!(&ast.errors().is_empty());
+    assert_eq!(0, ast.errors().len());
 
     let doc = ast.document();
 

crates/apollo-parser/examples/unused_vars.rs

@@ -11,7 +11,7 @@ fn are_variables_unused() {
     let parser = Parser::new(&src);
     let ast = parser.parse();
 
-    assert!(&ast.errors().is_empty());
+    assert_eq!(0, ast.errors().len());
 
     let doc = ast.document();
 

crates/apollo-parser/src/ast/mod.rs

@@ -42,7 +42,7 @@
 //! let parser = Parser::new(schema);
 //! let ast = parser.parse();
 //!
-//! assert!(ast.errors().is_empty());
+//! assert_eq!(0, ast.errors().len());
 //! let document = ast.document();
 //! for definition in document.definitions() {
 //!     match definition {

crates/apollo-parser/src/error.rs

@@ -16,7 +16,7 @@ use std::fmt;
 /// let parser = Parser::new(input);
 /// let ast = parser.parse();
 ///
-/// assert!(ast.errors().is_empty());
+/// assert_eq!(0, ast.errors().len());
 ///
 /// let doc = ast.document();
 /// ```

crates/apollo-parser/src/lexer/mod.rs

@@ -2,6 +2,8 @@ mod cursor;
 mod token;
 mod token_kind;
 
+use std::slice::Iter;
+
 use crate::{lexer::cursor::Cursor, Error};
 
 pub use token::Token;
@@ -59,8 +61,8 @@ impl Lexer {
     }
 
     /// Get a reference to the lexer's tokens.
-    pub(crate) fn errors(&self) -> &[Error] {
-        self.errors.as_slice()
+    pub(crate) fn errors<'e>(&'e self) -> Iter<'_, Error> {
+        self.errors.iter()
     }
 }
 

crates/apollo-parser/src/lib.rs

@@ -62,7 +62,7 @@
 //! let ast = parser.parse();
 //!
 //! // ast.errors() returns an errors slice encountered during lexing and parsing
-//! assert!(ast.errors().is_empty());
+//! assert_eq!(0, ast.errors().len());
 //!
 //! // ast.document() get the Document, or root node, of the tree that you can
 //! // start iterating on.
@@ -94,7 +94,7 @@
 //! ";
 //! let parser = Parser::new(input);
 //! let ast = parser.parse();
-//! assert!(ast.errors().is_empty());
+//! assert_eq!(0, ast.errors().len());
 //!
 //! let doc = ast.document();
 //!
@@ -125,7 +125,7 @@
 //!
 //! let parser = Parser::new(input);
 //! let ast = parser.parse();
-//! assert!(&ast.errors().is_empty());
+//! assert_eq!(0, ast.errors().len());
 //!
 //! let doc = ast.document();
 //!

crates/apollo-parser/src/parser/grammar/object.rs

@@ -131,7 +131,7 @@ type Business implements NamedEntity & ValuedEntity & CatEntity {
 }";
         let parser = Parser::new(input);
         let ast = parser.parse();
-        assert!(ast.errors().is_empty());
+        assert_eq!(0, ast.errors().len());
 
         let doc = ast.document();
 

crates/apollo-parser/src/parser/grammar/selection.rs

@@ -68,7 +68,7 @@ mod test {
 ";
         let parser = Parser::new(input);
         let ast = parser.parse();
-        assert!(&ast.errors().is_empty());
+        assert_eq!(0, ast.errors().len());
 
         let doc = ast.document();
 
@@ -129,7 +129,7 @@ query GraphQuery($graph_id: ID!, $variant: String) {
 ";
         let parser = Parser::new(input);
         let ast = parser.parse();
-        assert!(&ast.errors().is_empty());
+        assert_eq!(0, ast.errors().len());
 
         let doc = ast.document();
 

crates/apollo-parser/src/parser/grammar/union_.rs

@@ -112,7 +112,7 @@ mod test {
         let input = "union SearchResult = Photo | Person | Cat | Dog";
         let parser = Parser::new(input);
         let ast = parser.parse();
-        assert!(ast.errors().is_empty());
+        assert_eq!(0, ast.errors().len());
 
         let doc = ast.document();
 

crates/apollo-parser/src/parser/grammar/value.rs

@@ -270,7 +270,7 @@ query GraphQuery($graph_id: ID!, $variant: String) {
         ";
         let parser = Parser::new(input);
         let ast = parser.parse();
-        assert!(&ast.errors().is_empty());
+        assert_eq!(0, ast.errors().len());
 
         let doc = ast.document();
 

crates/apollo-parser/src/parser/mod.rs

@@ -42,7 +42,7 @@ pub(crate) use token_text::TokenText;
 /// // Parse the query, and return a SyntaxTree.
 /// let ast = parser.parse();
 /// // Check that are no errors. These are not part of the AST.
-/// assert!(&ast.errors().is_empty());
+/// assert_eq!(0, ast.errors().len());
 ///
 /// // Get the document root node
 /// let doc = ast.document();
@@ -65,7 +65,7 @@ pub(crate) use token_text::TokenText;
 /// let parser = Parser::new(core_schema);
 /// let ast = parser.parse();
 ///
-/// assert!(ast.errors().is_empty());
+/// assert_eq!(0, ast.errors().len());
 ///
 /// let document = ast.document();
 /// ```
@@ -91,7 +91,7 @@ impl Parser {
             tokens.push(s);
         }
 
-        for e in lexer.errors().to_owned() {
+        for e in lexer.errors().cloned() {
             errors.push(e);
         }
 

crates/apollo-parser/src/parser/syntax_tree.rs

@@ -1,4 +1,4 @@
-use std::fmt;
+use std::{fmt, slice::Iter};
 
 use rowan::GreenNodeBuilder;
 
@@ -44,8 +44,8 @@ pub struct SyntaxTree {
 
 impl SyntaxTree {
     /// Get a reference to the syntax tree's errors.
-    pub fn errors(&self) -> &[crate::Error] {
-        self.errors.as_ref()
+    pub fn errors(&self) -> Iter<'_, crate::Error> {
+        self.errors.iter()
     }
 
     /// Return the root typed `Document` node.
@@ -159,7 +159,7 @@ mod test {
         ";
         let parser = Parser::new(input);
         let ast = parser.parse();
-        assert!(ast.errors().is_empty());
+        assert_eq!(0, ast.errors().len());
 
         let doc = ast.document();
 

crates/apollo-parser/src/tests.rs

@@ -6,6 +6,7 @@ use std::{
     fmt::Write,
     fs,
     path::{Path, PathBuf},
+    slice::Iter,
 };
 
 use expect_test::expect_file;
@@ -52,25 +53,24 @@ fn parser_tests() {
     });
 }
 
-fn assert_errors_are_present(errors: &[Error], path: &Path) {
+fn assert_errors_are_present(errors: Iter<'_, Error>, path: &Path) {
     assert!(
-        !errors.is_empty(),
+        errors.len() != 0,
         "There should be errors in the file {:?}",
         path.display()
     );
 }
 
-fn assert_errors_are_absent(errors: &[Error], path: &Path) {
-    assert_eq!(
-        errors,
-        &[] as &[Error],
+fn assert_errors_are_absent<'e>(errors: Iter<'_, Error>, path: &Path) {
+    assert!(
+        errors.len() == 0,
         "There should be no errors in the file {:?}",
         path.display(),
     );
 }
 
 /// Concatenate tokens and erorrs.
-fn dump_tokens_and_errors(tokens: &[Token], errors: &[Error]) -> String {
+fn dump_tokens_and_errors<'e>(tokens: &[Token], errors: impl Iterator<Item = &'e Error>) -> String {
     let mut acc = String::new();
     for token in tokens {
         writeln!(acc, "{:?}", token).unwrap();