move CDDLTestParser to the tests::common mod

Author: Mr-Leshiy

rust/cbork-cddl-parser/src/lib.rs

@@ -3,8 +3,6 @@
 mod parser;
 mod preprocessor;
 
-pub use crate::parser::cddl_test;
-
 /// Represents different grammar extensions for handling CDDL specifications.
 pub enum Extension {
     /// RFC8610 ONLY limited grammar.

rust/cbork-cddl-parser/src/parser.rs

@@ -35,20 +35,6 @@ pub(crate) mod cddl {
     pub(crate) struct Parser;
 }
 
-/// Full CDDL syntax test parser.
-/// Parser with DEBUG rules. These rules are only used in tests.
-#[allow(missing_docs)]
-pub mod cddl_test {
-    pub use pest::Parser;
-    /// A Pest test parser for a full CDDL syntax.
-    #[derive(pest_derive::Parser)]
-    #[grammar = "grammar/rfc_8610.pest"]
-    #[grammar = "grammar/rfc_9165.pest"]
-    #[grammar = "grammar/cddl_modules.pest"]
-    #[grammar = "grammar/cddl_test.pest"] // Ideally this would only be used in tests.
-    pub struct CDDLTestParser;
-}
-
 /// CDDL Standard Postlude - read from an external file
 const POSTLUDE: &str = include_str!("grammar/postlude.cddl");
 

rust/cbork-cddl-parser/tests/byte_sequences.rs

@@ -1,9 +1,7 @@
 // cspell: words hexpair rstuvw abcdefghijklmnopqrstuvwyz rstuvw Xhhb Bhcm
 
-use cbork_cddl_parser::cddl_test::Rule;
-
 mod common;
-use common::byte_sequences::*;
+use common::{byte_sequences::*, Rule};
 
 #[test]
 /// Test if the `HEX_PAIR` rule passes properly.

rust/cbork-cddl-parser/tests/character_sets.rs

@@ -1,9 +1,8 @@
 // cspell: words PCHAR pchar BCHAR bchar SESC sesc SCHAR schar fffd fffe
 
-use cbork_cddl_parser::{
-    self,
-    cddl_test::{CDDLTestParser, Parser, Rule},
-};
+mod common;
+use common::{CDDLTestParser, Rule};
+use pest::Parser;
 
 #[test]
 /// Test if the `WHITESPACE` rule passes properly.

rust/cbork-cddl-parser/tests/comments.rs

@@ -1,7 +1,5 @@
-use cbork_cddl_parser::{self, cddl_test::Rule};
-
 mod common;
-use common::comments::*;
+use common::{comments::*, Rule};
 
 #[test]
 /// Test if the `COMMENT` rule passes properly.

rust/cbork-cddl-parser/tests/common/mod.rs

@@ -1,7 +1,4 @@
-use cbork_cddl_parser::{
-    self,
-    cddl_test::{CDDLTestParser, Parser, Rule},
-};
+use pest::Parser;
 
 pub(crate) mod byte_sequences;
 pub(crate) mod comments;
@@ -12,7 +9,16 @@ pub(crate) mod rules;
 pub(crate) mod text_sequences;
 pub(crate) mod type_declarations;
 
+/// A Pest test parser for a full CDDL syntax.
+#[derive(pest_derive::Parser)]
+#[grammar = "grammar/rfc_8610.pest"]
+#[grammar = "grammar/rfc_9165.pest"]
+#[grammar = "grammar/cddl_modules.pest"]
+#[grammar = "grammar/cddl_test.pest"] // Ideally this would only be used in tests.
+pub struct CDDLTestParser;
+
 /// # Panics
+#[allow(dead_code)]
 pub(crate) fn check_tests_rule(rule_type: Rule, passes: &[&str], fails: &[&str]) {
     for test in passes {
         let parse = CDDLTestParser::parse(rule_type, test);

rust/cbork-cddl-parser/tests/group_elements.rs

@@ -1,10 +1,8 @@
 // cspell: words OPTCOM MEMBERKEY bareword tstr GRPENT GRPCHOICE
 // cspell: words optcom memberkey grpent grpchoice
 
-use cbork_cddl_parser::{self, cddl_test::Rule};
-
 mod common;
-use common::{group_elements::*, identifiers::*};
+use common::{group_elements::*, identifiers::*, Rule};
 
 #[test]
 /// Test if the `occur` rule passes properly.

rust/cbork-cddl-parser/tests/identifiers.rs

@@ -1,12 +1,8 @@
 // cspell: words aname groupsocket typesocket groupsocket
 
-use cbork_cddl_parser::{
-    self,
-    cddl_test::{CDDLTestParser, Parser, Rule},
-};
-
 mod common;
-use common::identifiers::*;
+use common::{identifiers::*, CDDLTestParser, Rule};
+use pest::Parser;
 
 #[test]
 /// Check if the name components pass properly.

rust/cbork-cddl-parser/tests/literal_values.rs

@@ -2,10 +2,8 @@
 
 use std::ops::Deref;
 
-use cbork_cddl_parser::{self, cddl_test::Rule};
-
 mod common;
-use common::{byte_sequences::*, literal_values::*, text_sequences::*};
+use common::{byte_sequences::*, literal_values::*, text_sequences::*, Rule};
 
 #[test]
 /// Test if the `uint` rule passes properly.

rust/cbork-cddl-parser/tests/rules.rs

@@ -1,13 +1,9 @@
 // cspell: words GENERICARG bigfloat ASSIGNG GROUPNAME tstr genericarg GENERICARG
 // cspell: words assigng assignt ASSIGNT GENERICPARM genericparm
 
-use cbork_cddl_parser::{
-    self,
-    cddl_test::{CDDLTestParser, Parser, Rule},
-};
-
 mod common;
-use common::{rules::*, type_declarations::*};
+use common::{rules::*, type_declarations::*, CDDLTestParser, Rule};
+use pest::Parser;
 
 #[test]
 /// Test if the `genericarg` rule passes properly.