mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-05 11:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

revset: remove RevsetExpression::StringPattern hack

Browse source 
It's no longer needed since we have proper AST tree now.
This commit is contained in:
Yuya Nishihara 2024-05-27 13:43:34 +09:00
parent 89ac3a1851
commit 2c9132adfc
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/src/revset.rs
View file

@ -159,12 +159,6 @@ pub enum RevsetExpression {
All, All,
Commits(Vec<CommitId>), Commits(Vec<CommitId>),
CommitRef(RevsetCommitRef), CommitRef(RevsetCommitRef),
// TODO: This shouldn't be of RevsetExpression type. Maybe better to
// introduce an intermediate AST tree where aliases will be substituted.
StringPattern {
kind: String,
value: String,
},
Ancestors { Ancestors {
heads: Rc<RevsetExpression>, heads: Rc<RevsetExpression>,
generation: Range<u64>, generation: Range<u64>,
@ -979,7 +973,6 @@ fn try_transform_expression<E>(
RevsetExpression::All => None, RevsetExpression::All => None,
RevsetExpression::Commits(_) => None, RevsetExpression::Commits(_) => None,
RevsetExpression::CommitRef(_) => None, RevsetExpression::CommitRef(_) => None,
RevsetExpression::StringPattern { .. } => None,
RevsetExpression::Ancestors { heads, generation } => transform_rec(heads, pre, post)? RevsetExpression::Ancestors { heads, generation } => transform_rec(heads, pre, post)?
.map(|heads| RevsetExpression::Ancestors { .map(|heads| RevsetExpression::Ancestors {
heads, heads,
@ -1768,9 +1761,6 @@ impl VisibilityResolutionContext<'_> {
RevsetExpression::Commits(commit_ids) => { RevsetExpression::Commits(commit_ids) => {
ResolvedExpression::Commits(commit_ids.clone()) ResolvedExpression::Commits(commit_ids.clone())
} }
RevsetExpression::StringPattern { .. } => {
panic!("Expression '{expression:?}' should be rejected by parser");
}
RevsetExpression::CommitRef(_) => { RevsetExpression::CommitRef(_) => {
panic!("Expression '{expression:?}' should have been resolved by caller"); panic!("Expression '{expression:?}' should have been resolved by caller");
} }
@ -1881,7 +1871,6 @@ impl VisibilityResolutionContext<'_> {
| RevsetExpression::All | RevsetExpression::All
| RevsetExpression::Commits(_) | RevsetExpression::Commits(_)
| RevsetExpression::CommitRef(_) | RevsetExpression::CommitRef(_)
| RevsetExpression::StringPattern { .. }
| RevsetExpression::Ancestors { .. } | RevsetExpression::Ancestors { .. }
| RevsetExpression::Descendants { .. } | RevsetExpression::Descendants { .. }
| RevsetExpression::Range { .. } | RevsetExpression::Range { .. }