aboutsummaryrefslogtreecommitdiff
path: root/crates/mbe
diff options
context:
space:
mode:
Diffstat (limited to 'crates/mbe')
-rw-r--r--crates/mbe/src/mbe_expander/matcher.rs10
-rw-r--r--crates/mbe/src/subtree_source.rs10
2 files changed, 10 insertions, 10 deletions
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index b698b9832..39a8eefbd 100644
--- a/crates/mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
@@ -61,16 +61,16 @@ macro_rules! err {
61 61
62#[derive(Debug, Default)] 62#[derive(Debug, Default)]
63pub(super) struct Match { 63pub(super) struct Match {
64 pub bindings: Bindings, 64 pub(super) bindings: Bindings,
65 /// We currently just keep the first error and count the rest to compare matches. 65 /// We currently just keep the first error and count the rest to compare matches.
66 pub err: Option<ExpandError>, 66 pub(super) err: Option<ExpandError>,
67 pub err_count: usize, 67 pub(super) err_count: usize,
68 /// How many top-level token trees were left to match. 68 /// How many top-level token trees were left to match.
69 pub unmatched_tts: usize, 69 pub(super) unmatched_tts: usize,
70} 70}
71 71
72impl Match { 72impl Match {
73 pub fn add_err(&mut self, err: ExpandError) { 73 pub(super) fn add_err(&mut self, err: ExpandError) {
74 let prev_err = self.err.take(); 74 let prev_err = self.err.take();
75 self.err = prev_err.or(Some(err)); 75 self.err = prev_err.or(Some(err));
76 self.err_count += 1; 76 self.err_count += 1;
diff --git a/crates/mbe/src/subtree_source.rs b/crates/mbe/src/subtree_source.rs
index 396ce8b16..ccc56c479 100644
--- a/crates/mbe/src/subtree_source.rs
+++ b/crates/mbe/src/subtree_source.rs
@@ -7,9 +7,9 @@ use tt::buffer::{Cursor, TokenBuffer};
7 7
8#[derive(Debug, Clone, Eq, PartialEq)] 8#[derive(Debug, Clone, Eq, PartialEq)]
9struct TtToken { 9struct TtToken {
10 pub kind: SyntaxKind, 10 kind: SyntaxKind,
11 pub is_joint_to_next: bool, 11 is_joint_to_next: bool,
12 pub text: SmolStr, 12 text: SmolStr,
13} 13}
14 14
15pub(crate) struct SubtreeTokenSource<'a> { 15pub(crate) struct SubtreeTokenSource<'a> {
@@ -21,7 +21,7 @@ pub(crate) struct SubtreeTokenSource<'a> {
21impl<'a> SubtreeTokenSource<'a> { 21impl<'a> SubtreeTokenSource<'a> {
22 // Helper function used in test 22 // Helper function used in test
23 #[cfg(test)] 23 #[cfg(test)]
24 pub fn text(&self) -> SmolStr { 24 pub(crate) fn text(&self) -> SmolStr {
25 match *self.get(self.curr.1) { 25 match *self.get(self.curr.1) {
26 Some(ref tt) => tt.text.clone(), 26 Some(ref tt) => tt.text.clone(),
27 _ => SmolStr::new(""), 27 _ => SmolStr::new(""),
@@ -30,7 +30,7 @@ impl<'a> SubtreeTokenSource<'a> {
30} 30}
31 31
32impl<'a> SubtreeTokenSource<'a> { 32impl<'a> SubtreeTokenSource<'a> {
33 pub fn new(buffer: &'a TokenBuffer) -> SubtreeTokenSource<'a> { 33 pub(crate) fn new(buffer: &'a TokenBuffer) -> SubtreeTokenSource<'a> {
34 let cursor = buffer.begin(); 34 let cursor = buffer.begin();
35 35
36 let mut res = SubtreeTokenSource { 36 let mut res = SubtreeTokenSource {