From bc97543df312402e1c72a09fca568fa5cb0aef56 Mon Sep 17 00:00:00 2001 From: Nikhil Benesch Date: Wed, 19 Jun 2019 00:08:19 -0400 Subject: [PATCH 1/2] Actually check rustfmt in CI The previous incantation was simply *never* running rustfmt in CI, rather than only running rustfmt on the nightly build. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47f51a99d..bc7ef916f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ script: - travis-cargo clippy -- --all-targets --all-features -- -D warnings - travis-cargo build - travis-cargo test - - travis-cargo --only nightly fmt -- -- --check --config-path <(echo 'license_template_path = "HEADER"') + - cargo +nightly fmt -- --check --config-path <(echo 'license_template_path = "HEADER"') after_success: - cargo coveralls --verbose From 070d0192bf5785e765e4ca49addabf980a80ab11 Mon Sep 17 00:00:00 2001 From: Nikhil Benesch Date: Tue, 25 Jun 2019 18:07:05 -0400 Subject: [PATCH 2/2] Add missing license header --- src/ast/ddl.rs | 12 ++++++++++++ src/tokenizer.rs | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs index 6d2974635..7333ad287 100644 --- a/src/ast/ddl.rs +++ b/src/ast/ddl.rs @@ -1,3 +1,15 @@ +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + //! AST types specific to CREATE/ALTER variants of [Statement] //! (commonly referred to as Data Definition Language, or DDL) use super::{display_comma_separated, DataType, Expr, Ident, ObjectName}; diff --git a/src/tokenizer.rs b/src/tokenizer.rs index bdb8e55c3..62d534895 100644 --- a/src/tokenizer.rs +++ b/src/tokenizer.rs @@ -789,5 +789,4 @@ mod tests { //println!("------------------------------"); assert_eq!(expected, actual); } - }