squash! Update quasi, aster and syntex, remove nasty include! hack.

This is why I'm so happy with the move to aster, only one extra line of code
change.

Author: emilio

Cargo.toml

@@ -23,24 +23,24 @@ quasi_codegen = "0.15"
 
 [dependencies]
 clang-sys = "0.8.0"
-libc = "0.2.*"
-log = "0.3.*"
-env_logger = "*"
+libc = "0.2"
+log = "0.3"
+env_logger = "0.3"
 rustc-serialize = "0.3.19"
-syntex_syntax = "0.38"
+syntex_syntax = "0.43"
 regex = "0.1"
 
 [dependencies.aster]
 features = ["with-syntex"]
-version = "0.21.1"
+version = "0.26"
 
 [dependencies.clippy]
 optional = true
 version = "*"
 
 [dependencies.quasi]
 features = ["with-syntex"]
-version = "0.15"
+version = "0.19"
 
 [features]
 llvm_stable = []

src/codegen/mod.rs

@@ -1,3 +1,7 @@
+mod helpers;
+
+use self::helpers::{attributes, ArrayTyBuilder, BlobTyBuilder};
+
 use ir::context::BindgenContext;
 use ir::item::{Item, ItemId, ItemCanonicalName, ItemCanonicalPath};
 use ir::ty::{Type, TypeKind};
@@ -23,14 +27,6 @@ use syntax::codemap::{Span, respan};
 use syntax::ptr::P;
 use aster;
 
-// FIXME: This is shame, but we need to do this here since quasi eats the
-// includes in the "helpers" mod otherwise.
-mod helpers {
-    include!("helpers.rs");
-}
-
-use self::helpers::{attributes, ArrayTyBuilder, BlobTyBuilder};
-
 fn root_import(ctx: &BindgenContext) -> P<ast::Item> {
     assert!(ctx.options().enable_cxx_namespaces, "Somebody messed it up");
     let root = ctx.root_module().canonical_name(ctx);
@@ -1060,7 +1056,7 @@ impl MethodCodegen for Method {
             abi: Abi::Rust,
             decl: P(fndecl.clone()),
             generics: ast::Generics::default(),
-            constness: ast::Constness::NotConst,
+            constness: respan(ctx.span(), ast::Constness::NotConst),
         };
 
         // TODO: We need to keep in sync the argument names, so we should unify