From 7974269babedbc283ebf529aa4d42bc512101113 Mon Sep 17 00:00:00 2001 From: Yuya Nishihara Date: Thu, 6 Apr 2023 16:38:14 +0900 Subject: [PATCH] revset: remove None variant from resolved enum, use Commits([]) instead We'll remove All, so it makes sense to not have None either. --- lib/src/default_revset_engine.rs | 1 - lib/src/revset.rs | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/src/default_revset_engine.rs b/lib/src/default_revset_engine.rs index 797b1c34a..988d6d935 100644 --- a/lib/src/default_revset_engine.rs +++ b/lib/src/default_revset_engine.rs @@ -574,7 +574,6 @@ impl<'index, 'heads> EvaluationContext<'index, 'heads> { expression: &ResolvedExpression, ) -> Result + 'index>, RevsetEvaluationError> { match expression { - ResolvedExpression::None => Ok(Box::new(EagerRevset::empty())), ResolvedExpression::All => { // Since `all()` does not include hidden commits, some of the logical // transformation rules may subtly change the evaluated set. For example, diff --git a/lib/src/revset.rs b/lib/src/revset.rs index e62089302..c324b7751 100644 --- a/lib/src/revset.rs +++ b/lib/src/revset.rs @@ -460,7 +460,6 @@ pub enum ResolvedPredicateExpression { /// Use `RevsetExpression` API to build a query programmatically. #[derive(Clone, Debug, Eq, PartialEq)] pub enum ResolvedExpression { - None, All, // TODO: should be substituted at resolve_visibility() Commits(Vec), Children(Box), // TODO: add heads: VisibleHeads @@ -1816,7 +1815,7 @@ impl VisibilityResolutionContext { /// Resolves expression tree as set. fn resolve(&self, expression: &RevsetExpression) -> ResolvedExpression { match expression { - RevsetExpression::None => ResolvedExpression::None, + RevsetExpression::None => ResolvedExpression::Commits(vec![]), RevsetExpression::All => self.resolve_all(), RevsetExpression::Commits(commit_ids) => { ResolvedExpression::Commits(commit_ids.clone())