pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 06:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt for parser::PathParsingMode interface change in libsyntax

Browse Source 
This was renamed upstream in
https://github.com/rust-lang/rust/commit/6c44bea64435fd3859439a6ecab7758855a13f07

It's an incompatible change requiring new versions of syntex, aster, and
quasi.
This commit is contained in:
Olaf Buddenhagen
2016-05-02 07:12:05 +02:00
parent 0ff91e4451
commit 6e7a75c859
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde_codegen/Cargo.toml
+6 -6
View File
@@ -16,13 +16,13 @@ nightly-testing = ["clippy"]
with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies] [build-dependencies]
quasi_codegen = { version = "^0.9.0", optional = true } quasi_codegen = { version = "^0.10.0", optional = true }
syntex = { version = "^0.31.0", optional = true } syntex = { version = "^0.31.0", optional = true }
[dependencies] [dependencies]
aster = { version = "^0.15.0", default-features = false } aster = { version = "^0.16.0", default-features = false }
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.9.0", default-features = false } quasi = { version = "^0.10.0", default-features = false }
quasi_macros = { version = "^0.9.0", optional = true } quasi_macros = { version = "^0.10.0", optional = true }
syntex = { version = "^0.31.0", optional = true } syntex = { version = "^0.32.0", optional = true }
syntex_syntax = { version = "^0.31.0", optional = true } syntex_syntax = { version = "^0.32.0", optional = true }
serde_codegen/src/attr.rs
+2 -2
View File
@@ -4,7 +4,7 @@ use syntax::attr;
use syntax::codemap::Span; use syntax::codemap::Span;
use syntax::ext::base::ExtCtxt; use syntax::ext::base::ExtCtxt;
use syntax::fold::Folder; use syntax::fold::Folder;
use syntax::parse::parser::PathParsingMode; use syntax::parse::parser::PathStyle;
use syntax::parse::token::{self, InternedString}; use syntax::parse::token::{self, InternedString};
use syntax::parse; use syntax::parse;
use syntax::print::pprust::{lit_to_string, meta_item_to_string}; use syntax::print::pprust::{lit_to_string, meta_item_to_string};
@@ -488,7 +488,7 @@ fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::
let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts); let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts);
let path = match parser.parse_path(PathParsingMode::LifetimeAndTypesWithoutColons) { let path = match parser.parse_path(PathStyle::Type) {
Ok(path) => path, Ok(path) => path,
Err(mut e) => { Err(mut e) => {
e.emit(); e.emit();
serde_tests/Cargo.toml
+3 -3
View File
@@ -14,14 +14,14 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies] [build-dependencies]
syntex = { version = "^0.31.0" } syntex = { version = "^0.32.0" }
syntex_syntax = { version = "^0.31.0" } syntex_syntax = { version = "^0.32.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] } serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies] [dev-dependencies]
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" } serde = { version = "*", path = "../serde" }
syntex = "^0.31.0" syntex = "^0.32.0"
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }