From e2bb8475779ce154599fc1b2f6213aec643f69cd Mon Sep 17 00:00:00 2001 From: Joscha Date: Sat, 19 Nov 2022 11:01:09 +0100 Subject: [PATCH] Simplify imports --- src/ast/call.rs | 4 +--- src/ast/expr.rs | 9 +-------- src/ast/field.rs | 3 +-- src/ast/lit.rs | 3 +-- src/ast/table_constr.rs | 4 +--- src/ast/table_destr.rs | 3 +-- src/ast/var.rs | 3 +-- 7 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/ast/call.rs b/src/ast/call.rs index 413dab5..ca1d1b9 100644 --- a/src/ast/call.rs +++ b/src/ast/call.rs @@ -1,8 +1,6 @@ use crate::span::{HasSpan, Span}; -use super::basic::Space; -use super::expr::Expr; -use super::table_constr::TableConstr; +use super::{Expr, Space, TableConstr}; #[derive(Debug, Clone)] pub enum Call { diff --git a/src/ast/expr.rs b/src/ast/expr.rs index d156271..e01b6c4 100644 --- a/src/ast/expr.rs +++ b/src/ast/expr.rs @@ -1,13 +1,6 @@ use crate::span::{HasSpan, Span}; -use super::basic::Space; -use super::call::Call; -use super::field::Field; -use super::func_def::FuncDef; -use super::lit::Lit; -use super::table_constr::TableConstr; -use super::table_destr::TableDestr; -use super::var::Var; +use super::{Call, Field, FuncDef, Lit, Space, TableConstr, TableDestr, Var}; #[derive(Debug, Clone, Copy)] pub enum BinOp { diff --git a/src/ast/field.rs b/src/ast/field.rs index 2ca6db8..c8c10b4 100644 --- a/src/ast/field.rs +++ b/src/ast/field.rs @@ -1,7 +1,6 @@ use crate::span::{HasSpan, Span}; -use super::basic::{Ident, Space}; -use super::expr::Expr; +use super::{Expr, Ident, Space}; #[derive(Debug, Clone)] pub enum Field { diff --git a/src/ast/lit.rs b/src/ast/lit.rs index 1af89cf..c410471 100644 --- a/src/ast/lit.rs +++ b/src/ast/lit.rs @@ -3,8 +3,7 @@ use std::fmt; use crate::builtin::Builtin; use crate::span::{HasSpan, Span}; -use super::basic::{Ident, Space}; -use super::expr::Expr; +use super::{Expr, Ident, Space}; #[derive(Clone)] pub enum NumLitStr { diff --git a/src/ast/table_constr.rs b/src/ast/table_constr.rs index c065643..0b699cc 100644 --- a/src/ast/table_constr.rs +++ b/src/ast/table_constr.rs @@ -1,8 +1,6 @@ use crate::span::{HasSpan, Span}; -use super::basic::Space; -use super::expr::Expr; -use super::lit::TableLitElem; +use super::{Expr, Space, TableLitElem}; #[derive(Debug, Clone)] pub enum TableConstrElem { diff --git a/src/ast/table_destr.rs b/src/ast/table_destr.rs index b450bf8..2886985 100644 --- a/src/ast/table_destr.rs +++ b/src/ast/table_destr.rs @@ -1,7 +1,6 @@ use crate::span::{HasSpan, Span}; -use super::basic::{Ident, Space}; -use super::expr::Expr; +use super::{Expr, Ident, Space}; #[derive(Debug, Clone)] pub enum TablePatternElem { diff --git a/src/ast/var.rs b/src/ast/var.rs index 30c1686..bc32e7a 100644 --- a/src/ast/var.rs +++ b/src/ast/var.rs @@ -1,7 +1,6 @@ use crate::span::{HasSpan, Span}; -use super::basic::{Ident, Space}; -use super::expr::Expr; +use super::{Expr, Ident, Space}; #[derive(Debug, Clone)] pub enum Var {