Merge branch origin/master into origin/post

This commit is contained in:
David Tolnay
2016-10-19 23:59:53 -07:00
14 changed files with 15 additions and 2356 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.8.13"
version = "0.8.14"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
+2 -2
View File
@@ -172,8 +172,8 @@ macro_rules! shim {
use syntax::parse;
let name = stringify!($name).to_string();
let cfg = Vec::new();
let sess = parse::ParseSess::new();
let impl_item = parse::parse_item_from_source_str(name, expanded, cfg, &sess);
let sess = cx.parse_sess;
let impl_item = parse::parse_item_from_source_str(name, expanded, cfg, sess);
push(::syntax::ext::base::Annotatable::Item(impl_item.unwrap().unwrap()));
}
};