wip

Cargo.toml

@@ -7,4 +7,4 @@ opt-level = 3
 
 [profile.dev]
 # Speeds up the build. May need to diable for debugging.
-debug = 0
+debug = 1

crates/hir/src/lower/parse.rs

@@ -41,13 +41,13 @@ impl DiagnosticVoucher for ParserError {
 
     fn to_complete(&self, _db: &dyn SpannedHirDb) -> CompleteDiagnostic {
         let error_code = self.error_code();
-        let span = Span::new(self.file, self.error.range, SpanKind::Original);
+        let span = Span::new(self.file, self.error.range(), SpanKind::Original);
         CompleteDiagnostic::new(
             Severity::Error,
-            self.error.msg.clone(),
+            self.error.msg(),
             vec![SubDiagnostic::new(
                 LabelStyle::Primary,
-                self.error.msg.clone(),
+                self.error.msg(),
                 Some(span),
             )],
             vec![],

crates/parser2/Cargo.toml

@@ -15,6 +15,8 @@ logos = "0.12.1"
 rustc-hash = "1.1.0"
 lazy_static = "1.4.0"
 derive_more = "0.99"
+smallvec = { version = "1.11.2", features = ["union"] }
+unwrap-infallible = "0.1.5"
 
 [dev-dependencies]
 fe-compiler-test-utils = { path = "../test-utils" }

crates/parser2/src/ast/attr.rs

@@ -137,7 +137,7 @@ mod tests {
     fn parse_attr_list(source: &str) -> AttrList {
         let lexer = Lexer::new(source);
         let mut parser = Parser::new(lexer);
-        parser.parse(AttrListScope::default(), None);
+        parser.parse(AttrListScope::default()).unwrap();
         AttrList::cast(parser.finish_to_node().0).unwrap()
     }
 

crates/parser2/src/ast/expr.rs

@@ -536,7 +536,7 @@ pub enum ArithBinOp {
     BitAnd(SyntaxToken),
     /// `|`
     BitOr(SyntaxToken),
-    /// `^`  
+    /// `^`
     BitXor(SyntaxToken),
 }
 impl ArithBinOp {
@@ -674,7 +674,7 @@ mod tests {
     {
         let lexer = Lexer::new(source);
         let mut parser = Parser::new(lexer);
-        crate::parser::expr::parse_expr(&mut parser);
+        crate::parser::expr::parse_expr(&mut parser).unwrap();
         Expr::cast(parser.finish_to_node().0)
             .unwrap()
             .kind()
@@ -913,6 +913,7 @@ mod tests {
 
         let if_expr: IfExpr = parse_expr("if { true } { return } else { continue }");
         if let ExprKind::Block(stmts) = if_expr.cond().unwrap().kind() {
+            dbg!(&stmts);
             assert!(matches!(
                 stmts.into_iter().next().unwrap().kind(),
                 crate::ast::StmtKind::Expr(_)

crates/parser2/src/ast/item.rs

@@ -475,7 +475,7 @@ mod tests {
         let lexer = Lexer::new(source);
         let mut parser = Parser::new(lexer);
 
-        parser.parse(ItemListScope::default(), None);
+        let _ = parser.parse(ItemListScope::default());
         let (node, errs) = parser.finish_to_node();
         for e in errs {
             eprintln!("{:?}", e);
@@ -729,6 +729,7 @@ mod tests {
         let u: Use = parse_item(source);
         let use_tree = u.use_tree().unwrap();
         let mut count = 0;
+        dbg!(use_tree.path().unwrap());
         for segment in use_tree.path().unwrap() {
             match count {
                 0 => {