Switch to the Rust 2018 edition

This requires Rust 1.31 (from last year) to build, but is otherwise
compatible with the 2015-edition code.
This commit is contained in:
Nickolay Ponomarev 2019-04-21 00:13:37 +03:00
parent ef76baa7fd
commit b12a19e197
12 changed files with 10 additions and 23 deletions

View file

@ -12,6 +12,7 @@ include = [
"src/**/*.rs", "src/**/*.rs",
"Cargo.toml", "Cargo.toml",
] ]
edition = "2018"
[lib] [lib]
name = "sqlparser" name = "sqlparser"

View file

@ -1,5 +1,5 @@
extern crate simple_logger; use simple_logger;
extern crate sqlparser;
///! A small command-line app to run the parser. ///! A small command-line app to run the parser.
/// Run with `cargo run --example cli` /// Run with `cargo run --example cli`
use std::fs; use std::fs;

View file

@ -1,5 +1,3 @@
extern crate sqlparser;
use sqlparser::dialect::GenericSqlDialect; use sqlparser::dialect::GenericSqlDialect;
use sqlparser::sqlparser::*; use sqlparser::sqlparser::*;

View file

@ -1,4 +1,4 @@
use dialect::Dialect; use crate::dialect::Dialect;
pub struct AnsiSqlDialect {} pub struct AnsiSqlDialect {}

View file

@ -1,4 +1,4 @@
use dialect::Dialect; use crate::dialect::Dialect;
pub struct GenericSqlDialect {} pub struct GenericSqlDialect {}
impl Dialect for GenericSqlDialect { impl Dialect for GenericSqlDialect {

View file

@ -1,4 +1,4 @@
use dialect::Dialect; use crate::dialect::Dialect;
pub struct PostgreSqlDialect {} pub struct PostgreSqlDialect {}

View file

@ -35,11 +35,6 @@
//! println!("AST: {:?}", ast); //! println!("AST: {:?}", ast);
//! ``` //! ```
#[macro_use]
extern crate log;
extern crate chrono;
extern crate uuid;
pub mod dialect; pub mod dialect;
pub mod sqlast; pub mod sqlast;
pub mod sqlparser; pub mod sqlparser;

View file

@ -483,7 +483,7 @@ impl ToString for FileFormat {
} }
} }
use sqlparser::ParserError; use crate::sqlparser::ParserError;
use std::str::FromStr; use std::str::FromStr;
impl FromStr for FileFormat { impl FromStr for FileFormat {
type Err = ParserError; type Err = ParserError;

View file

@ -14,6 +14,8 @@
//! SQL Parser //! SQL Parser
use log::debug;
use super::dialect::keywords; use super::dialect::keywords;
use super::dialect::Dialect; use super::dialect::Dialect;
use super::sqlast::*; use super::sqlast::*;

View file

@ -1,6 +1,3 @@
extern crate log;
extern crate sqlparser;
use sqlparser::dialect::AnsiSqlDialect; use sqlparser::dialect::AnsiSqlDialect;
use sqlparser::sqlast::*; use sqlparser::sqlast::*;
use sqlparser::sqlparser::*; use sqlparser::sqlparser::*;

View file

@ -1,6 +1,3 @@
extern crate log;
extern crate sqlparser;
use sqlparser::dialect::*; use sqlparser::dialect::*;
use sqlparser::sqlast::*; use sqlparser::sqlast::*;
use sqlparser::sqlparser::*; use sqlparser::sqlparser::*;

View file

@ -1,13 +1,10 @@
extern crate log; use log::debug;
extern crate sqlparser;
use sqlparser::dialect::PostgreSqlDialect; use sqlparser::dialect::PostgreSqlDialect;
use sqlparser::sqlast::*; use sqlparser::sqlast::*;
use sqlparser::sqlparser::*; use sqlparser::sqlparser::*;
use sqlparser::sqltokenizer::*; use sqlparser::sqltokenizer::*;
use log::*;
#[test] #[test]
fn test_prev_index() { fn test_prev_index() {
let sql: &str = "SELECT version()"; let sql: &str = "SELECT version()";