Commit local changes (whoops!)

compiler/parse/src/ast.rs

@@ -13,7 +13,17 @@ pub struct Collection<'a, T> {
 
 impl<'a, T> Collection<'a, T> {
     pub fn empty() -> Collection<'a, T> {
-        Collection { items: &[], final_comments: &[] }
+        Collection {
+            items: &[],
+            final_comments: &[],
+        }
+    }
+
+    pub fn with_items(items: &'a [T]) -> Collection<'a, T> {
+        Collection {
+            items,
+            final_comments: &[],
+        }
     }
 }
 

compiler/parse/src/header.rs

@@ -1,4 +1,4 @@
-use crate::ast::{CommentOrNewline, Spaceable, StrLiteral, TypeAnnotation};
+use crate::ast::{Collection, CommentOrNewline, Spaceable, StrLiteral, TypeAnnotation};
 use crate::blankspace::space0_e;
 use crate::ident::lowercase_ident;
 use crate::parser::Progress::{self, *};
@@ -81,7 +81,7 @@ pub enum To<'a> {
 #[derive(Clone, Debug, PartialEq)]
 pub struct AppHeader<'a> {
     pub name: Loc<StrLiteral<'a>>,
-    pub packages: Vec<'a, Loc<PackageEntry<'a>>>,
+    pub packages: Collection<'a, Loc<PackageEntry<'a>>>,
     pub imports: Vec<'a, Loc<ImportsEntry<'a>>>,
     pub provides: Vec<'a, Loc<ExposesEntry<'a, &'a str>>>,
     pub to: Loc<To<'a>>,
@@ -146,7 +146,7 @@ pub struct PlatformHeader<'a> {
     pub name: Loc<PackageName<'a>>,
     pub requires: PlatformRequires<'a>,
     pub exposes: Vec<'a, Loc<ExposesEntry<'a, ModuleName<'a>>>>,
-    pub packages: Vec<'a, Loc<PackageEntry<'a>>>,
+    pub packages: Collection<'a, Loc<PackageEntry<'a>>>,
     pub imports: Vec<'a, Loc<ImportsEntry<'a>>>,
     pub provides: Vec<'a, Loc<ExposesEntry<'a, &'a str>>>,
     pub effects: Effects<'a>,

compiler/parse/src/module.rs

@@ -1,4 +1,4 @@
-use crate::ast::{CommentOrNewline, Def, Module};
+use crate::ast::{Collection, CommentOrNewline, Def, Module};
 use crate::blankspace::{space0_around_ee, space0_before_e, space0_e};
 use crate::header::{
     package_entry, package_name, package_or_path, AppHeader, Effects, ExposesEntry, ImportsEntry,
@@ -203,7 +203,7 @@ fn app_header<'a>() -> impl Parser<'a, AppHeader<'a>, EHeader<'a>> {
         let (_, provides, state) =
             specialize(EHeader::Provides, provides_to()).parse(arena, state)?;
 
-        let (before_packages, after_packages, package_entries) = match opt_pkgs {
+        let (before_packages, after_packages, packages) = match opt_pkgs {
             Some(pkgs) => {
                 let pkgs: Packages<'a> = pkgs; // rustc must be told the type here
 
@@ -213,7 +213,7 @@ fn app_header<'a>() -> impl Parser<'a, AppHeader<'a>, EHeader<'a>> {
                     pkgs.entries,
                 )
             }
-            None => (&[] as _, &[] as _, Vec::new_in(arena)),
+            None => (&[] as _, &[] as _, Collection::empty()),
         };
 
         // rustc must be told the type here
@@ -229,7 +229,7 @@ fn app_header<'a>() -> impl Parser<'a, AppHeader<'a>, EHeader<'a>> {
 
         let header = AppHeader {
             name,
-            packages: package_entries,
+            packages,
             imports,
             provides: provides.entries,
             to: provides.to,
@@ -582,11 +582,9 @@ where
 
 #[derive(Debug)]
 struct Packages<'a> {
-    entries: Vec<'a, Located<PackageEntry<'a>>>,
-
+    entries: Collection<'a, Located<PackageEntry<'a>>>,
     before_packages_keyword: &'a [CommentOrNewline<'a>],
     after_packages_keyword: &'a [CommentOrNewline<'a>],
-    final_comments: &'a [CommentOrNewline<'a>],
 }
 
 #[inline(always)]
@@ -615,12 +613,11 @@ fn packages<'a>() -> impl Parser<'a, Packages<'a>, EPackages<'a>> {
                 PackageEntry::SpaceBefore
             )
         ),
-        |((before_packages_keyword, after_packages_keyword), (entries, final_comments))| {
+        |((before_packages_keyword, after_packages_keyword), entries): ((_, _), Collection<'a, _>)| {
             Packages {
                 entries,
                 before_packages_keyword,
                 after_packages_keyword,
-                final_comments,
             }
         }
     )

compiler/parse/src/type_annotation.rs

@@ -1,4 +1,4 @@
-use crate::ast::{AssignedField, Tag, TypeAnnotation, Collection};
+use crate::ast::{AssignedField, Collection, Tag, TypeAnnotation};
 use crate::blankspace::{space0_around_ee, space0_before_e, space0_e};
 use crate::keyword;
 use crate::parser::{