simplify;clean up

SichangHe · Oct 31, 2023 · a4a93ea · a4a93ea
1 parent c567c55
commit a4a93ea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/route_verification/Cargo.lock b/route_verification/Cargo.lock
diff --git a/route_verification/parse/Cargo.toml b/route_verification/parse/Cargo.toml
@@ -6,15 +6,10 @@ edition = "2021"
 [dependencies]
 anyhow.workspace = true
 ipnet.workspace = true
-itertools.workspace = true
 lazy-regex.workspace = true
 log.workspace = true
 rayon.workspace = true
-serde.workspace = true
-serde_json.workspace = true
 
-common_regex.workspace = true
-io.workspace = true
 ir.workspace = true
 lex.workspace = true
 shared_struct.workspace = true

diff --git a/route_verification/parse/src/lex.rs b/route_verification/parse/src/lex.rs
@@ -1,5 +1,4 @@
 use ::lex;
-use ir::aut_sys::parse_aut_num_name;
 
 use super::*;
 

diff --git a/route_verification/parse/src/peering.rs b/route_verification/parse/src/peering.rs
@@ -1,13 +1,13 @@
-use ::lex::{mp_import, peering};
+use ::lex;
 
 use super::*;
 
-pub fn parse_mp_peerings(mp_peerings: Vec<mp_import::PeeringAction>) -> Vec<PeeringAction> {
+pub fn parse_mp_peerings(mp_peerings: Vec<lex::PeeringAction>) -> Vec<PeeringAction> {
     mp_peerings.into_iter().map(parse_peering_action).collect()
 }
 
-pub fn parse_peering_action(peering_action: mp_import::PeeringAction) -> PeeringAction {
-    let mp_import::PeeringAction {
+pub fn parse_peering_action(peering_action: lex::PeeringAction) -> PeeringAction {
+    let lex::PeeringAction {
         mp_peering,
         actions,
     } = peering_action;
@@ -19,8 +19,8 @@ pub fn parse_peering_action(peering_action: mp_import::PeeringAction) -> Peering
     }
 }
 
-pub fn parse_mp_peering(mp_peering: peering::Peering) -> Peering {
-    let peering::Peering {
+pub fn parse_mp_peering(mp_peering: lex::Peering) -> Peering {
+    let lex::Peering {
         as_expr,
         router_expr1,
         router_expr2,
@@ -35,28 +35,28 @@ pub fn parse_mp_peering(mp_peering: peering::Peering) -> Peering {
     }
 }
 
-pub fn parse_as_expr(as_expr: peering::AsExpr) -> AsExpr {
+pub fn parse_as_expr(as_expr: lex::AsExpr) -> AsExpr {
     match as_expr {
-        peering::AsExpr::Field(single) => parse_single_as_expr(single),
-        peering::AsExpr::AsComp(comp) => parse_complex_as_expr(comp),
+        lex::AsExpr::Field(single) => parse_single_as_expr(single),
+        lex::AsExpr::AsComp(comp) => parse_complex_as_expr(comp),
     }
 }
 
-pub fn parse_complex_as_expr(comp: peering::ComplexAsExpr) -> AsExpr {
+pub fn parse_complex_as_expr(comp: lex::ComplexAsExpr) -> AsExpr {
     use AsExpr::*;
     match comp {
-        peering::ComplexAsExpr::And { left, right } => And {
+        lex::ComplexAsExpr::And { left, right } => And {
             left: Box::new(parse_as_expr(*left)),
             right: Box::new(parse_as_expr(*right)),
         },
-        peering::ComplexAsExpr::Or { left, right } => Or {
+        lex::ComplexAsExpr::Or { left, right } => Or {
             left: Box::new(parse_as_expr(*left)),
             right: Box::new(parse_as_expr(*right)),
         },
-        peering::ComplexAsExpr::Except { left, right } => Except {
+        lex::ComplexAsExpr::Except { left, right } => Except {
             left: Box::new(parse_as_expr(*left)),
             right: Box::new(parse_as_expr(*right)),
         },
-        peering::ComplexAsExpr::Group(group) => Group(Box::new(parse_as_expr(*group))),
+        lex::ComplexAsExpr::Group(group) => Group(Box::new(parse_as_expr(*group))),
     }
 }