[WIP] parsing fixes, better error handling, fuzzing

Cargo.toml

@@ -13,7 +13,6 @@ harness = false
 name = "all-packages"
 
 [dependencies]
-cbitset = "0.2.0"
 rowan = "0.12.5"
 smol_str = "0.1.17"
 

examples/list-fns.rs

@@ -1,7 +1,7 @@
 use std::{env, error::Error, fs};
 
-use smol_str::SmolStr;
 use rnix::{types::*, NodeOrToken, SyntaxKind::*, SyntaxNode};
+use smol_str::SmolStr;
 
 fn main() -> Result<(), Box<dyn Error>> {
     let file = match env::args().skip(1).next() {

fuzz/.gitignore

@@ -0,0 +1,3 @@
+target
+corpus
+artifacts

fuzz/Cargo.toml

@@ -0,0 +1,31 @@
+[package]
+name = "rnix-fuzz"
+version = "0.0.0"
+authors = ["Automatically generated"]
+publish = false
+edition = "2018"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+
+[dependencies.rnix]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[[bin]]
+name = "parser"
+path = "fuzz_targets/parser.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "lexer"
+path = "fuzz_targets/lexer.rs"
+test = false
+doc = false

fuzz/fuzz_targets/lexer.rs

@@ -0,0 +1,8 @@
+#![no_main]
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|data: &[u8]| {
+    if let Ok(text) = std::str::from_utf8(data) {
+        let _ = rnix::tokenizer::tokenize(text);
+    }
+});

fuzz/fuzz_targets/parser.rs

@@ -0,0 +1,14 @@
+#![no_main]
+use libfuzzer_sys::fuzz_target;
+
+use std::io::{self, Write};
+
+fuzz_target!(|data: &[u8]| {
+    let stdout = io::stdout();
+    let mut handle = stdout.lock();
+
+    if let Ok(text) = std::str::from_utf8(data) {
+        writeln!(handle, "Fuzzing {:?}\n\n", data).unwrap();
+        let _ = rnix::parse(text);
+    }
+});

src/lib.rs

@@ -2,19 +2,21 @@
 mod macros;
 mod kinds;
 pub mod parser;
+mod token_set;
 pub mod tokenizer;
 pub mod types;
 pub mod value;
 
 pub use self::{
     kinds::SyntaxKind,
     parser::AST,
+    token_set::TokenSet,
     value::{StrPart, Value as NixValue},
 };
 
 pub use rowan::{
-    NodeOrToken, SyntaxElementChildren, SyntaxNodeChildren, TextRange, TextSize,
-    TokenAtOffset, WalkEvent,
+    NodeOrToken, SyntaxElementChildren, SyntaxNodeChildren, TextRange, TextSize, TokenAtOffset,
+    WalkEvent,
 };
 
 use self::tokenizer::Tokenizer;