Remove "sql" from module names

It's redundant.

Author: benesch

examples/cli.rs

@@ -7,7 +7,7 @@ use simple_logger;
 use std::fs;
 
 use sqlparser::dialect::*;
-use sqlparser::sqlparser::Parser;
+use sqlparser::parser::Parser;
 
 fn main() {
     simple_logger::init().unwrap();

examples/parse_select.rs

@@ -1,7 +1,7 @@
 #![warn(clippy::all)]
 
 use sqlparser::dialect::GenericSqlDialect;
-use sqlparser::sqlparser::*;
+use sqlparser::parser::*;
 
 fn main() {
     let sql = "SELECT a, b, 123, myfunc(b) \

src/sqlast/ddl.rs renamed to src/ast/ddl.rs

@@ -15,8 +15,8 @@
 //! SQL Abstract Syntax Tree (AST) types
 
 mod ddl;
+mod operator;
 mod query;
-mod sql_operator;
 mod sqltype;
 mod value;
 
@@ -30,7 +30,7 @@ pub use self::query::{
 pub use self::sqltype::SQLType;
 pub use self::value::Value;
 
-pub use self::sql_operator::SQLOperator;
+pub use self::operator::SQLOperator;
 
 /// Like `vec.join(", ")`, but for any types implementing ToString.
 fn comma_separated_string<I>(iter: I) -> String
@@ -682,7 +682,7 @@ impl ToString for FileFormat {
     }
 }
 
-use crate::sqlparser::ParserError;
+use crate::parser::ParserError;
 use std::str::FromStr;
 impl FromStr for FileFormat {
     type Err = ParserError;

src/sqlast/mod.rs renamed to src/ast/mod.rs

@@ -1,13 +1,13 @@
-mod ansi_sql;
-mod generic_sql;
+mod ansi;
+mod generic;
 pub mod keywords;
 mod mssql;
 mod postgresql;
 
 use std::fmt::Debug;
 
-pub use self::ansi_sql::AnsiSqlDialect;
-pub use self::generic_sql::GenericSqlDialect;
+pub use self::ansi::AnsiSqlDialect;
+pub use self::generic::GenericSqlDialect;
 pub use self::mssql::MsSqlDialect;
 pub use self::postgresql::PostgreSqlDialect;
 

src/sqlast/sql_operator.rs renamed to src/ast/operator.rs

@@ -21,7 +21,7 @@
 //!
 //! ```
 //! use sqlparser::dialect::GenericSqlDialect;
-//! use sqlparser::sqlparser::Parser;
+//! use sqlparser::parser::Parser;
 //!
 //! let dialect = GenericSqlDialect {}; // or AnsiSqlDialect
 //!
@@ -36,10 +36,10 @@
 //! ```
 #![warn(clippy::all)]
 
+pub mod ast;
 pub mod dialect;
-pub mod sqlast;
-pub mod sqlparser;
-pub mod sqltokenizer;
+pub mod parser;
+pub mod tokenizer;
 
 #[doc(hidden)]
 // This is required to make utilities accessible by both the crate-internal

src/sqlast/query.rs renamed to src/ast/query.rs

@@ -16,10 +16,10 @@
 
 use log::debug;
 
+use super::ast::*;
 use super::dialect::keywords;
 use super::dialect::Dialect;
-use super::sqlast::*;
-use super::sqltokenizer::*;
+use super::tokenizer::*;
 use std::error::Error;
 
 #[derive(Debug, Clone, PartialEq)]

src/sqlast/sqltype.rs renamed to src/ast/sqltype.rs

@@ -1,9 +1,9 @@
 use std::fmt::Debug;
 
+use super::ast::*;
 use super::dialect::*;
-use super::sqlast::*;
-use super::sqlparser::{Parser, ParserError};
-use super::sqltokenizer::Tokenizer;
+use super::parser::{Parser, ParserError};
+use super::tokenizer::Tokenizer;
 
 /// Tests use the methods on this struct to invoke the parser on one or
 /// multiple dialects.

src/sqlast/value.rs renamed to src/ast/value.rs

@@ -8,8 +8,8 @@
 
 use matches::assert_matches;
 
-use sqlparser::sqlast::*;
-use sqlparser::sqlparser::*;
+use sqlparser::ast::*;
+use sqlparser::parser::*;
 use sqlparser::test_utils::{all_dialects, expr_from_projection, only};
 
 #[test]

src/dialect/ansi_sql.rs renamed to src/dialect/ansi.rs

@@ -2,8 +2,8 @@
 //! Test SQL syntax specific to Microsoft's T-SQL. The parser based on the
 //! generic dialect is also tested (on the inputs it can handle).
 
+use sqlparser::ast::*;
 use sqlparser::dialect::{GenericSqlDialect, MsSqlDialect};
-use sqlparser::sqlast::*;
 use sqlparser::test_utils::*;
 
 #[test]

src/dialect/generic_sql.rs renamed to src/dialect/generic.rs

@@ -2,8 +2,8 @@
 //! Test SQL syntax specific to PostgreSQL. The parser based on the
 //! generic dialect is also tested (on the inputs it can handle).
 
+use sqlparser::ast::*;
 use sqlparser::dialect::{GenericSqlDialect, PostgreSqlDialect};
-use sqlparser::sqlast::*;
 use sqlparser::test_utils::*;
 
 #[test]