Merge pull request #109 from jdm/rustup

Upgrade to 2015-08-30 rustc nightly.

num-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "num-macros"
-version = "0.1.26"
+version = "0.1.27"
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 homepage = "https://github.com/rust-lang/num"

num-macros/src/lib.rs

@@ -64,6 +64,7 @@ pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
     let inline = cx.meta_word(span, InternedString::new("inline"));
     let attrs = vec!(cx.attribute(span, inline));
     let trait_def = TraitDef {
+        is_unsafe: false,
         span: span,
         attributes: Vec::new(),
         path: path!(num::FromPrimitive),