Fixing more errors.

src/parser/plain_text.rs

@@ -7,12 +7,15 @@ use nom::combinator::recognize;
 use nom::combinator::verify;
 use nom::multi::many_till;
 
-use super::object::PlainText;
+use super::object_parser::any_object_except_plain_text;
 use super::org_source::OrgSource;
 use super::radio_link::RematchObject;
-use super::Context;
-use super::Object;
+use super::util::exit_matcher_parser;
+use crate::context::parser_with_context;
+use crate::context::RefContext;
 use crate::error::Res;
+use crate::types::Object;
+use crate::types::PlainText;
 
 #[cfg_attr(feature = "tracing", tracing::instrument(ret, level = "debug"))]
 pub fn plain_text<'r, 's>(
@@ -66,14 +69,18 @@ mod tests {
     use nom::combinator::map;
 
     use super::*;
-    use crate::parser::parser_context::ContextTree;
-    use crate::parser::parser_with_context::parser_with_context;
-    use crate::parser::source::Source;
+    use crate::context::Context;
+    use crate::context::ContextElement;
+    use crate::context::GlobalSettings;
+    use crate::context::List;
+    use crate::types::Source;
 
     #[test]
     fn plain_text_simple() {
         let input = OrgSource::new("foobarbaz");
-        let initial_context: ContextTree<'_, '_> = ContextTree::new();
+        let global_settings = GlobalSettings::default();
+        let initial_context = ContextElement::document_context();
+        let initial_context = Context::new(&global_settings, List::new(&initial_context));
         let plain_text_matcher = parser_with_context!(plain_text)(&initial_context);
         let (remaining, result) = map(plain_text_matcher, Object::PlainText)(input).unwrap();
         assert_eq!(Into::<&str>::into(remaining), "");