Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyvalues-parser/src/text/parse/escaped.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use super::*;
use pest::Parser as _;
pub type PestError = pest::error::Error<Rule>;
struct Parser;
crate::common_parsing!(Parser, Rule, true);
common_parsing!(Parser, Rule, true);
#[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub enum Rule {
Expand Down
4 changes: 3 additions & 1 deletion keyvalues-parser/src/text/parse/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ mod raw {

// unfortunate hack to re-use most of the code that consumes the pest parser produced by our two
// separate grammars :/
#[macro_export]
macro_rules! common_parsing {
($parser:ty, $rule:ty, $parse_escaped:expr) => {
/// Attempts to parse VDF text to a [`Vdf`]
Expand Down Expand Up @@ -147,6 +146,9 @@ macro_rules! common_parsing {
};
}

// expose ^^ macro to the rest of the crate
pub(crate) use common_parsing;

pub use escaped::{parse as escaped_parse, PestError as EscapedPestError};
pub use raw::{parse as raw_parse, PestError as RawPestError};

Expand Down
2 changes: 1 addition & 1 deletion keyvalues-parser/src/text/parse/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use super::*;
use pest::Parser as _;
pub type PestError = pest::error::Error<Rule>;
struct Parser;
crate::common_parsing!(Parser, Rule, false);
common_parsing!(Parser, Rule, false);
#[allow(dead_code, non_camel_case_types, clippy::upper_case_acronyms)]
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
pub enum Rule {
Expand Down
2 changes: 1 addition & 1 deletion keyvalues-parser/tests/grammar_generator/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fn generate_file(parser: Parser) -> String {
use pest::Parser as _;
pub type PestError = pest::error::Error<Rule>;
struct Parser;
crate::common_parsing!(Parser, Rule, #is_escaped);
common_parsing!(Parser, Rule, #is_escaped);
#expanded_tokens
};
let mut file = syn::parse_file(&file.to_string()).unwrap();
Expand Down
Loading