fix: make stage3 constructs usable outside the lib

nvim-neorg · Aug 14, 2024 · d89c701 · d89c701
1 parent 07fd9c3
commit d89c701
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -3,13 +3,9 @@ use error::NorgParseError;
 
 use crate::stage_1::stage_1;
 use crate::stage_2::stage_2;
-use crate::stage_3::stage_3;
 
 pub use crate::stage_2::ParagraphSegmentToken;
-pub use crate::stage_3::{
-    CarryoverTag, DetachedModifierExtension, NestableDetachedModifier, NorgASTFlat,
-    RangeableDetachedModifier, RangedTag, TodoStatus,
-};
+pub use crate::stage_3::*;
 
 mod error;
 mod stage_1;

diff --git a/src/stage_3.rs b/src/stage_3.rs
@@ -4,21 +4,21 @@ use serde::Serialize;
 
 use crate::stage_2::{NorgBlock, ParagraphSegmentToken, ParagraphTokenList};
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize)]
 pub enum NestableDetachedModifier {
     Quote,
     UnorderedList,
     OrderedList,
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize)]
 pub enum RangeableDetachedModifier {
     Definition,
     Footnote,
     Table,
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize)]
 pub enum TodoStatus {
     /// ` `
     Undone,
@@ -38,7 +38,7 @@ pub enum TodoStatus {
     Canceled,
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize)]
 pub enum DetachedModifierExtension {
     /// todo item status:
     /// `- ( ) undone`
@@ -69,7 +69,7 @@ pub enum DetachedModifierExtension {
     StartDate(String),
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Hash, Debug, PartialEq, Eq, Serialize)]
 pub enum CarryoverTag {
     Attribute, // `+`
     Macro,     // `#`
@@ -468,7 +468,7 @@ fn parse_paragraph(
     )))
 }
 
-#[derive(Debug, PartialEq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Hash, Eq, Serialize)]
 pub enum NorgASTFlat {
     Paragraph(Vec<ParagraphSegment>),
     NestableDetachedModifier {