Merge pull request #109 from jdm/rustup

Upgrade to 2015-08-30 rustc nightly.
This commit is contained in:
Alex Crichton 2015-09-01 14:33:25 -07:00
commit 1e07193480
2 changed files with 2 additions and 1 deletions

View File

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

View File

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