Update our codebase for nightly-2016-07-07

Had to delete the test for the owned value to insert. Message involving
the types is now a note not part of the error. Unsure if this is because
it *actually* changed to a note, or if it's a quirk in compile_tests
0.2.0 (if I test for the note I need to specify *all* notes and the note
on the overflow error is enought o make me not want to do that

Author: sgrif

.travis.yml

@@ -4,7 +4,7 @@ dist: trusty
 rust:
   - stable
   - beta
-  - nightly-2016-05-09
+  - nightly-2016-07-07
   - nightly
 addons:
   postgresql: '9.4'

CHANGELOG.md

@@ -24,6 +24,9 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
 
 ### Changed
 
+* Diesel now targets `nightly-2016-07-07`. Future releases will update to a
+  newer nightly version on the date that Rust releases.
+
 * Most structs that implement `Queryable` will now also need
   `#[derive(Identifiable)]`.
 

diesel_codegen/build.rs

@@ -6,9 +6,9 @@ mod inner {
     use std::env;
     use std::path::Path;
 
-    use self::syntax::ast;
     use self::syntax::codemap::Span;
     use self::syntax::ext::base::{self, ExtCtxt};
+    use self::syntax::tokenstream::TokenTree;
 
     pub fn main() {
         let out_dir = env::var_os("OUT_DIR").unwrap();
@@ -19,7 +19,7 @@ mod inner {
                 fn $name<'cx>(
                     cx: &'cx mut ExtCtxt,
                     sp: Span,
-                    tts: &[ast::TokenTree],
+                    tts: &[tokenstream::TokenTree],
                 ) -> Box<base::MacResult + 'cx> {
                     syntax::ext::quote::$name(cx, sp, tts)
                 }

diesel_codegen/src/dummy_schema_inference.rs

@@ -1,11 +1,11 @@
-use syntax::ast;
 use syntax::codemap::Span;
 use syntax::ext::base::*;
+use syntax::tokenstream;
 
 pub fn expand_load_table<'cx>(
     cx: &'cx mut ExtCtxt,
     sp: Span,
-    _tts: &[ast::TokenTree]
+    _tts: &[tokenstream::TokenTree]
 ) -> Box<MacResult+'cx> {
     cx.span_warn(sp, "load_table_from_schema! is only supported on PostgreSQL");
     DummyResult::any(sp)
@@ -14,7 +14,7 @@ pub fn expand_load_table<'cx>(
 pub fn expand_infer_schema<'cx>(
     cx: &'cx mut ExtCtxt,
     sp: Span,
-    _tts: &[ast::TokenTree]
+    _tts: &[tokenstream::TokenTree]
 ) -> Box<MacResult+'cx> {
     cx.span_warn(sp, "infer_schema! is only supported on PostgreSQL");
     DummyResult::any(sp)

diesel_codegen/src/migrations.rs

@@ -7,11 +7,12 @@ use syntax::ext::base::*;
 use syntax::util::small_vector::SmallVector;
 use syntax::ptr::P;
 use syntax::ext::build::AstBuilder;
+use syntax::tokenstream;
 
 pub fn expand_embed_migrations<'cx>(
     cx: &'cx mut ExtCtxt,
     sp: Span,
-    tts: &[ast::TokenTree]
+    tts: &[tokenstream::TokenTree]
 ) -> Box<MacResult+'cx> {
     let migrations_expr = migrations_directory_from_args(cx, sp, tts)
         .and_then(|d| migration_literals_from_path(cx, sp, &d));
@@ -67,7 +68,7 @@ pub fn expand_embed_migrations<'cx>(
 fn migrations_directory_from_args(
     cx: &mut ExtCtxt,
     sp: Span,
-    tts: &[ast::TokenTree],
+    tts: &[tokenstream::TokenTree],
 ) -> Result<PathBuf, Box<Error>> {
     let callsite_file = cx.codemap().span_to_filename(sp);
     let relative_path_to_migrations = if tts.is_empty() {

diesel_codegen/src/schema_inference/mod.rs

@@ -11,13 +11,14 @@ use syntax::ext::base::*;
 use syntax::parse::token::{InternedString, str_to_ident};
 use syntax::ptr::P;
 use syntax::util::small_vector::SmallVector;
+use syntax::tokenstream;
 
 use self::data_structures::*;
 
 pub fn expand_load_table<'cx>(
     cx: &'cx mut ExtCtxt,
     sp: Span,
-    tts: &[ast::TokenTree]
+    tts: &[tokenstream::TokenTree]
 ) -> Box<MacResult+'cx> {
     let mut exprs = match get_exprs_from_tts(cx, sp, tts) {
         Some(ref exprs) if exprs.is_empty() => {
@@ -49,7 +50,7 @@ pub fn load_table_body<T: Iterator<Item=P<ast::Expr>>>(
 pub fn expand_infer_schema<'cx>(
     cx: &'cx mut ExtCtxt,
     sp: Span,
-    tts: &[ast::TokenTree]
+    tts: &[tokenstream::TokenTree]
 ) -> Box<MacResult+'cx> {
     let mut exprs = match get_exprs_from_tts(cx, sp, tts) {
         Some(exprs) => exprs.into_iter(),
@@ -105,7 +106,7 @@ fn table_macro_call(
                         table_name, primary_keys.len()));
                 Err(DummyResult::any(sp))
             } else {
-                let tokens = data.iter().map(|a| column_def_tokens(cx, a, &connection))
+                let tokens = data.iter().map(|a| column_def_tokens(cx, sp, a, &connection))
                     .collect::<Vec<_>>();
                 let table_name = str_to_ident(table_name);
                 let primary_key = str_to_ident(&primary_keys[0]);
@@ -131,11 +132,11 @@ fn next_str_lit<T: Iterator<Item=P<ast::Expr>>>(
     }
 }
 
-fn column_def_tokens(cx: &mut ExtCtxt, attr: &ColumnInformation, conn: &InferConnection)
-    -> Vec<ast::TokenTree>
+fn column_def_tokens(cx: &mut ExtCtxt, span: Span, attr: &ColumnInformation, conn: &InferConnection)
+    -> Vec<tokenstream::TokenTree>
 {
     let column_name = str_to_ident(&attr.column_name);
-    let tpe = determine_column_type(cx, attr, conn);
+    let tpe = determine_column_type(cx, span, attr, conn);
     quote_tokens!(cx, $column_name -> $tpe,)
 }
 
@@ -202,14 +203,14 @@ fn load_table_names(connection: &InferConnection) -> QueryResult<Vec<String>> {
     }
 }
 
-fn determine_column_type(cx: &mut ExtCtxt, attr: &ColumnInformation, conn: &InferConnection)
+fn determine_column_type(cx: &mut ExtCtxt, span: Span, attr: &ColumnInformation, conn: &InferConnection)
     -> P<ast::Ty>
 {
     match *conn {
         #[cfg(feature = "sqlite")]
-        InferConnection::Sqlite(_) => sqlite::determine_column_type(cx, attr),
+        InferConnection::Sqlite(_) => sqlite::determine_column_type(cx, span, attr),
         #[cfg(feature = "postgres")]
-        InferConnection::Pg(_) => pg::determine_column_type(cx, attr),
+        InferConnection::Pg(_) => pg::determine_column_type(cx, span, attr),
     }
 }
 

diesel_codegen/src/schema_inference/pg.rs

@@ -1,9 +1,10 @@
 use diesel::*;
 use diesel::pg::PgConnection;
 use syntax::ast;
+use syntax::codemap::Span;
 use syntax::ext::base::*;
-use syntax::ptr::P;
 use syntax::parse::token::str_to_ident;
+use syntax::ptr::P;
 
 use super::data_structures::*;
 
@@ -45,7 +46,7 @@ table! {
     }
 }
 
-pub fn determine_column_type(cx: &mut ExtCtxt, attr: &ColumnInformation) -> P<ast::Ty> {
+pub fn determine_column_type(cx: &mut ExtCtxt, _span: Span, attr: &ColumnInformation) -> P<ast::Ty> {
     let tpe = if attr.type_name.starts_with("_") {
         let subtype = str_to_ident(&capitalize(&attr.type_name[1..]));
         quote_ty!(cx, Array<$subtype>)

diesel_codegen/src/schema_inference/sqlite.rs

@@ -3,6 +3,7 @@ use diesel::expression::dsl::sql;
 use diesel::sqlite::{SqliteConnection, Sqlite};
 use diesel::types::{HasSqlType, FromSqlRow};
 use syntax::ast;
+use syntax::codemap::Span;
 use syntax::ext::base::*;
 use syntax::ptr::P;
 
@@ -26,7 +27,7 @@ pub fn get_table_data(conn: &SqliteConnection, table_name: &str)
     sql::<pragma_table_info::SqlType>(&query).load(conn)
 }
 
-pub fn determine_column_type(cx: &mut ExtCtxt, attr: &ColumnInformation) -> P<ast::Ty> {
+pub fn determine_column_type(cx: &mut ExtCtxt, span: Span, attr: &ColumnInformation) -> P<ast::Ty> {
     let type_name = attr.type_name.to_lowercase();
     let tpe = if is_bool(&type_name) {
         quote_ty!(cx, ::diesel::types::Bool)
@@ -45,7 +46,7 @@ pub fn determine_column_type(cx: &mut ExtCtxt, attr: &ColumnInformation) -> P<as
     } else if is_double(&type_name) {
         quote_ty!(cx, ::diesel::types::Double)
     } else {
-        cx.span_err(cx.original_span(), &format!("Unsupported type: {}", type_name));
+        cx.span_err(span, &format!("Unsupported type: {}", type_name));
         quote_ty!(cx, ())
     };
 

diesel_compile_tests/Cargo.toml

@@ -6,4 +6,4 @@ authors = ["Sean Griffin <sean@seantheprogrammer.com>"]
 [dependencies]
 diesel = { path = "../diesel", features = ["sqlite", "postgres"] }
 diesel_codegen = { path = "../diesel_codegen", default-features = false, features = ["nightly", "postgres", "sqlite"] }
-compiletest_rs = "0.1.0"
+compiletest_rs = "0.2.0"

diesel_compile_tests/tests/compile-fail/find_requires_correct_type.rs

@@ -21,7 +21,13 @@ fn main() {
     int_primary_key::table.find("1").first(&connection).unwrap();
     //~^ ERROR no method named `first` found for type `diesel::query_source::filter::FilteredQuerySource<int_primary_key::table, diesel::expression::predicates::Eq<int_primary_key::columns::id, &str>>` in the current scope
     //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
     string_primary_key::table.find(1).first(&connection).unwrap();
     //~^ ERROR no method named `first` found for type `diesel::query_source::filter::FilteredQuerySource<string_primary_key::table, diesel::expression::predicates::Eq<string_primary_key::columns::id, _>>` in the current scope
     //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
+    //~| ERROR E0277
 }