diff --git a/quasi/Cargo.toml b/quasi/Cargo.toml index 931f399f..b71f7993 100644 --- a/quasi/Cargo.toml +++ b/quasi/Cargo.toml @@ -13,5 +13,5 @@ unstable-testing = ["clippy"] [dependencies] clippy = { version = "^0.*", optional = true } -syntex_errors = { version = "^0.48.0", optional = true } -syntex_syntax = { version = "^0.48.0", optional = true } +syntex_errors = { version = "^0.50.0", optional = true } +syntex_syntax = { version = "^0.50.0", optional = true } diff --git a/quasi/src/lib.rs b/quasi/src/lib.rs index ed6efd55..577b7304 100644 --- a/quasi/src/lib.rs +++ b/quasi/src/lib.rs @@ -93,43 +93,43 @@ impl ToTokens for ast::Ident { impl ToTokens for ast::Path { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(DUMMY_SP, token::Interpolated(token::NtPath(Box::new(self.clone()))))] + vec![TokenTree::Token(DUMMY_SP, token::Interpolated(Rc::new(token::NtPath(self.clone()))))] } } impl ToTokens for ast::Ty { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtTy(P(self.clone()))))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtTy(P(self.clone())))))] } } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtTy(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtTy(self.clone()))))] } } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtBlock(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtBlock(self.clone()))))] } } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtItem(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtItem(self.clone()))))] } } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtImplItem(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtImplItem((**self).clone()))))] } } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtTraitItem(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtTraitItem((**self).clone()))))] } } @@ -169,7 +169,7 @@ impl ToTokens for ast::WhereClause { impl ToTokens for ast::Stmt { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { let mut tts = vec![ - TokenTree::Token(self.span, token::Interpolated(token::NtStmt(P(self.clone())))) + TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtStmt(self.clone())))) ]; // Some statements require a trailing semicolon. @@ -183,19 +183,19 @@ impl ToTokens for ast::Stmt { impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtExpr(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtExpr(self.clone()))))] } } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(self.span, token::Interpolated(token::NtPat(self.clone())))] + vec![TokenTree::Token(self.span, token::Interpolated(Rc::new(token::NtPat(self.clone()))))] } } impl ToTokens for ast::Arm { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(DUMMY_SP, token::Interpolated(token::NtArm(self.clone())))] + vec![TokenTree::Token(DUMMY_SP, token::Interpolated(Rc::new(token::NtArm(self.clone()))))] } } @@ -221,7 +221,7 @@ impl_to_tokens_slice! { P, [] } impl ToTokens for P { fn to_tokens(&self, _cx: &ExtCtxt) -> Vec { - vec![TokenTree::Token(DUMMY_SP, token::Interpolated(token::NtMeta(self.clone())))] + vec![TokenTree::Token(DUMMY_SP, token::Interpolated(Rc::new(token::NtMeta(self.clone()))))] } } diff --git a/quasi_codegen/Cargo.toml b/quasi_codegen/Cargo.toml index 658172dc..715459f8 100644 --- a/quasi_codegen/Cargo.toml +++ b/quasi_codegen/Cargo.toml @@ -13,8 +13,8 @@ with-syntex = ["syntex", "syntex_errors", "syntex_syntax", "aster/with-syntex"] unstable-testing = ["clippy"] [dependencies] -aster = { version = "^0.33.0", default-features = false } +aster = { version = "^0.34.0", default-features = false } clippy = { version = "^0.*", optional = true } -syntex = { version = "^0.48.0", optional = true } -syntex_errors = { version = "^0.48.0", optional = true } -syntex_syntax = { version = "^0.48.0", optional = true } +syntex = { version = "^0.50.0", optional = true } +syntex_errors = { version = "^0.50.0", optional = true } +syntex_syntax = { version = "^0.50.0", optional = true } diff --git a/quasi_macros/Cargo.toml b/quasi_macros/Cargo.toml index 3f838493..37920bed 100644 --- a/quasi_macros/Cargo.toml +++ b/quasi_macros/Cargo.toml @@ -19,5 +19,5 @@ clippy = { version = "^0.*", optional = true } quasi_codegen = { version = "^0.25", path = "../quasi_codegen", default-features = false } [dev-dependencies] -aster = "^0.33.0" +aster = "^0.34.0" quasi = { version = "^0.25", path = "../quasi" } diff --git a/quasi_tests/Cargo.toml b/quasi_tests/Cargo.toml index 36635635..c0a25e10 100644 --- a/quasi_tests/Cargo.toml +++ b/quasi_tests/Cargo.toml @@ -12,13 +12,13 @@ unstable-testing = ["clippy", "quasi/unstable-testing", "quasi_codegen/unstable- [build-dependencies] quasi_codegen = { path = "../quasi_codegen" } -syntex = { version = "^0.48.0" } +syntex = { version = "^0.50.0" } [dependencies] clippy = { version = "^0.*", optional = true } [dev-dependencies] -aster = { version = "^0.33.0", features = ["with-syntex"] } +aster = { version = "^0.34.0", features = ["with-syntex"] } quasi = { path = "../quasi", features = ["with-syntex"] } -syntex = { version = "^0.48.0" } -syntex_syntax = { version = "^0.48.0" } +syntex = { version = "^0.50.0" } +syntex_syntax = { version = "^0.50.0" }