Merge pull request #138 from farcaller/fix-nightly

Fixes for nightly fallout

Reviewed-by: farcaller

ioreg/builder/register.rs

@@ -17,6 +17,7 @@ use std::gc::GC;
 use std::iter::FromIterator;
 use syntax::ast;
 use syntax::ast::P;
+use syntax::ast_util::empty_generics;
 use syntax::codemap::{respan, mk_sp};
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::build::AstBuilder;
@@ -80,7 +81,7 @@ fn build_field_type<'a>(cx: &'a ExtCtxt, path: &Vec<String>,
       let item: P<ast::Item> = box(GC) ast::Item {
         ident: name,
         id: ast::DUMMY_NODE_ID,
-        node: ast::ItemEnum(enum_def, utils::no_generics()),
+        node: ast::ItemEnum(enum_def, empty_generics()),
         vis: ast::Public,
         attrs: attrs,
         span: field.ty.span,

ioreg/builder/union.rs

@@ -17,6 +17,7 @@ use std::gc::{Gc, GC};
 use std::iter::FromIterator;
 use syntax::ast;
 use syntax::ast::P;
+use syntax::ast_util::empty_generics;
 use syntax::codemap::{DUMMY_SP, dummy_spanned};
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::build::AstBuilder;
@@ -193,7 +194,7 @@ impl<'a, 'b, 'c> BuildUnionTypes<'a, 'b, 'c> {
       ident: self.cx.ident_of(name.node.as_slice()),
       attrs: attrs,
       id: ast::DUMMY_NODE_ID,
-      node: ast::ItemStruct(box(GC) struct_def, utils::no_generics()),
+      node: ast::ItemStruct(box(GC) struct_def, empty_generics()),
       vis: ast::Public,
       span: name.span,
     }

ioreg/builder/utils.rs

@@ -18,18 +18,10 @@ use syntax::ast;
 use syntax::ast::P;
 use syntax::codemap::DUMMY_SP;
 use syntax::ext::build::AstBuilder;
-use syntax::owned_slice::OwnedSlice;
 use syntax::parse::token;
 
 use super::super::node;
 
-pub fn no_generics() -> ast::Generics {
-  ast::Generics {
-    lifetimes: Vec::new(),
-    ty_params: OwnedSlice::empty()
-  }
-}
-
 /// Generate an unsuffixed integer literal expression with a dummy span
 pub fn expr_int<'a>(cx: &'a ExtCtxt, n: i64) -> P<ast::Expr> {
   let sign = if n < 0 {ast::Minus} else {ast::Plus};

macro/platformtree.rs

@@ -109,6 +109,10 @@ fn macro_zinc_task(cx: &mut ExtCtxt, _: Span, _: Gc<ast::MetaItem>,
       let new_generics = ast::Generics {
         lifetimes: vec!(),
         ty_params: OwnedSlice::from_vec(params),
+        where_clause: ast::WhereClause {
+          id: ast::DUMMY_NODE_ID,
+          predicates: vec!(),
+        }
       };
       let new_node = ast::ItemFn(new_decl, style, abi, new_generics, block);
 

platformtree/builder/os.rs

@@ -174,6 +174,10 @@ fn build_args(builder: &mut Builder, cx: &mut ExtCtxt,
     }, ast::Generics {
       lifetimes: vec!(cx.lifetime_def(DUMMY_SP, intern("'a"), vec!())),
       ty_params: OwnedSlice::from_vec(collected_params),
+      where_clause: ast::WhereClause {
+        id: ast::DUMMY_NODE_ID,
+        predicates: vec!(),
+      }
     }),
     vis: ast::Public,
     span: DUMMY_SP,

src/drivers/chario.rs

@@ -16,7 +16,7 @@
 //! Generic char output trait.
 
 use core::str::{Str, StrSlice};
-use core::slice::{Vector, ImmutableVector};
+use core::slice::{Slice, ImmutableSlice};
 use core::collections::Collection;
 use core::iter::range;
 

src/drivers/lcd/c12332.rs

@@ -24,7 +24,7 @@ might be an issue for any other peripheral sharing the same SPI bus.
 */
 
 use core::cell;
-use core::slice::ImmutableVector;
+use core::slice::ImmutableSlice;
 use core::mem::zeroed;
 use core::iter::range;