From 498d5c06605ed5612426358334cb159d19162a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Tue, 21 Mar 2017 21:26:05 +0100 Subject: [PATCH] Updating syntex et al (#4983) * Migrating to new syntex * Updating to latest syntex * Another fix for nightly --- Cargo.lock | 111 +++++++++++-------- dapps/Cargo.toml | 2 +- dapps/js-glue/Cargo.toml | 14 +-- dapps/js-glue/build.rs | 4 +- dapps/js-glue/src/build.rs | 5 +- dapps/js-glue/src/codegen.rs | 56 +++++----- dapps/js-glue/src/lib.rs | 1 - ipc/codegen/Cargo.toml | 14 +-- ipc/codegen/build.rs | 4 +- ipc/codegen/src/codegen.rs | 179 ++++++++++++++++--------------- ipc/codegen/src/lib.rs | 8 +- ipc/codegen/src/serialization.rs | 37 ++++--- js/Cargo.precompiled.toml | 4 +- js/Cargo.toml | 6 +- signer/Cargo.toml | 2 +- stratum/src/traits.rs | 4 +- 16 files changed, 240 insertions(+), 211 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02ac8995d..e61658e16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -102,10 +102,10 @@ dependencies = [ [[package]] name = "aster" -version = "0.17.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -455,7 +455,7 @@ dependencies = [ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.7.0", "parity-reactor 0.1.0", "parity-ui 1.7.0", @@ -502,11 +502,11 @@ dependencies = [ name = "ethcore-ipc-codegen" version = "1.7.0" dependencies = [ - "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -671,7 +671,7 @@ dependencies = [ "ethcore-util 1.7.0", "jsonrpc-core 6.0.0 (git+https://github.com/ethcore/jsonrpc.git?branch=parity-1.6)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-ui 1.7.0", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1598,16 +1598,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-dapps-glue" -version = "1.4.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1685,16 +1685,16 @@ dependencies = [ name = "parity-ui" version = "1.7.0" dependencies = [ - "parity-ui-dev 1.4.0", + "parity-ui-dev 1.7.0", "parity-ui-precompiled 1.4.0 (git+https://github.com/ethcore/js-precompiled.git)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-ui-dev" -version = "1.4.0" +version = "1.7.0" dependencies = [ - "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1702,7 +1702,7 @@ name = "parity-ui-precompiled" version = "1.4.0" source = "git+https://github.com/ethcore/js-precompiled.git#47da49294ad958933e85a9c4f0f2bb4df5dc47de" dependencies = [ - "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1830,20 +1830,22 @@ dependencies = [ [[package]] name = "quasi" -version = "0.11.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_codegen" -version = "0.11.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2268,23 +2270,44 @@ dependencies = [ [[package]] name = "syntex" -version = "0.33.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_errors" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_pos" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syntex_syntax" -version = "0.33.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2311,7 +2334,7 @@ dependencies = [ [[package]] name = "term" -version = "0.2.14" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2449,11 +2472,6 @@ name = "unicode-normalization" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "unicode-xid" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "unicode-xid" version = "0.0.4" @@ -2587,7 +2605,7 @@ dependencies = [ "checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" "checksum app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7d1c0d48a81bbb13043847f957971f4d87c81542d80ece5e84ba3cba4058fd4" "checksum arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "16e3bdb2f54b3ace0285975d59a97cf8ed3855294b2b6bc651fcf22a9c352975" -"checksum aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "07d344974f0a155f091948aa389fb1b912d3a58414fbdb9c8d446d193ee3496a" +"checksum aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfdf7355d9db158df68f976ed030ab0f6578af811f5a7bb6dcf221ec24e0e0" "checksum base-x 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f59103b47307f76e03bef1633aec7fa9e29bfb5aa6daf5a334f94233c71f6c1" "checksum base32 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1b9605ba46d61df0410d8ac686b0007add8172eba90e8e909c347856fe794d8c" "checksum bigint 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2311bcd71b281e142a095311c22509f0d6bcd87b3000d7dbaa810929b9d6f6ae" @@ -2698,7 +2716,7 @@ dependencies = [ "checksum openssl-sys 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d2845e841700e7b04282ceaa115407ea84e0db918ae689ad9ceb6f06fa6046bd" "checksum order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb" "checksum owning_ref 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8d91377085359426407a287ab16884a0111ba473aa6844ff01d4ec20ce3d75e7" -"checksum parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98378dec0a185da2b7180308752f0bad73aaa949c3e0a3b0528d0e067945f7ab" +"checksum parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e1d06f6ee0fda786df3784a96ee3f0629f529b91cbfb7d142f6410e6bcd1ce2c" "checksum parity-ui-precompiled 1.4.0 (git+https://github.com/ethcore/js-precompiled.git)" = "" "checksum parking_lot 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e1435e7a2a00dfebededd6c6bdbd54008001e94b4a2aadd6aef0dc4c56317621" "checksum parking_lot_core 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb1b97670a2ffadce7c397fb80a3d687c4f3060140b885621ef1653d0e5d5068" @@ -2713,8 +2731,8 @@ dependencies = [ "checksum primal-check 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "647c81b67bb9551a7b88d0bcd785ac35b7d0bf4b2f358683d7c2375d04daec51" "checksum primal-estimate 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "56ea4531dde757b56906493c8604641da14607bf9cdaa80fb9c9cabd2429f8d5" "checksum primal-sieve 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7aa73fd87e5984a00bdb4c1b14d3d5d6d0bad01b2caaaf924c16ab7260ac946c" -"checksum quasi 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b26543b563704e7d87f3ec7cfafb713010a905c5f1b155a8ab66863af43ca578" -"checksum quasi_codegen 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0881d9a45d5f9ebe4a7e77742f8c604f3658c212baf8dd711a692dd000bc648c" +"checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3" +"checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4" "checksum quick-error 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0aad603e8d7fb67da22dbdf1f4b826ce8829e406124109e73cf1b2454b93a71c" "checksum quine-mc_cluskey 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6683b0e23d80813b1a535841f0048c1537d3f86d63c999e8373b39a9b0eb74a" "checksum quote 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "6732e32663c9c271bfc7c1823486b471f18c47a2dbf87c066897b7b51afc83be" @@ -2764,12 +2782,14 @@ dependencies = [ "checksum stable-heap 0.1.0 (git+https://github.com/carllerche/stable-heap?rev=3c5cd1ca47)" = "" "checksum strsim 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4d73a2c36a4d095ed1a6df5cbeac159863173447f7a82b3f4757426844ab825" "checksum syn 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f4f94368aae82bb29656c98443a7026ca931a659e8d19dcdc41d6e273054e820" -"checksum syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393b6dd0889df2b064beeea954cfda6bc2571604ac460deeae0fed55a53988af" -"checksum syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44bded3cabafc65c90b663b1071bd2d198a9ab7515e6ce729e4570aaf53c407e" +"checksum syntex 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35f3cc9d446323ef8fefad933b65cd6de271d29fa14a2e9d036a084770c6d6d5" +"checksum syntex_errors 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3af03823ea45d420dd2c1a44bb074e13ea55f9b99afe960fd58eb4069b7f6cad" +"checksum syntex_pos 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1e502a4a904d9f37cf975dbdbb0b08f2d111322f6792bda6eb095b4112c9a24b" +"checksum syntex_syntax 0.58.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6cf936464c3863952ea3fab848860ea891eba8647b6008b04c36f0bb007192a3" "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" -"checksum term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "f2077e54d38055cf1ca0fd7933a2e00cd3ec8f6fed352b2a377f06dcdaaf3281" +"checksum term 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d168af3930b369cfe245132550579d47dfd873d69470755a19c2c6568dbbd989" "checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a" "checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" "checksum thread_local 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0694f51610ef7cfac7a1b81de7f1602ee5356e76541bcd62c40e71933338cab1" @@ -2786,7 +2806,6 @@ dependencies = [ "checksum unicase 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13a5906ca2b98c799f4b1ab4557b76367ebd6ae5ef14930ec841c74aed5f3764" "checksum unicode-bidi 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c1f7ceb96afdfeedee42bade65a0d585a6a0106f681b6749c8ff4daa8df30b3f" "checksum unicode-normalization 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "26643a2f83bac55f1976fb716c10234485f9202dcd65cfbdf9da49867b271172" -"checksum unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "36dff09cafb4ec7c8cf0023eb0b686cb6ce65499116a12201c9e11840ca01beb" "checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" "checksum untrusted 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "193df64312e3515fd983ded55ad5bcaa7647a035804828ed757e832ce6029ef3" "checksum url 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afe9ec54bc4db14bc8744b7fed060d785ac756791450959b2248443319d5b119" diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index 55becf2c1..8a00f503f 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -22,7 +22,7 @@ serde = "0.9" serde_json = "0.9" serde_derive = "0.9" linked-hash-map = "0.3" -parity-dapps-glue = "1.4" +parity-dapps-glue = "1.7" base32 = "0.3" mime = "0.2" mime_guess = "1.6.1" diff --git a/dapps/js-glue/Cargo.toml b/dapps/js-glue/Cargo.toml index b53b158c7..0f4c92968 100644 --- a/dapps/js-glue/Cargo.toml +++ b/dapps/js-glue/Cargo.toml @@ -7,17 +7,17 @@ authors = ["Parity Technologies "] build = "build.rs" [build-dependencies] -quasi_codegen = { version = "0.11", optional = true } -syntex = { version = "0.33", optional = true } +quasi_codegen = { version = "0.32", optional = true } +syntex = { version = "0.58", optional = true } [dependencies] glob = { version = "0.2.11" } mime_guess = { version = "1.6.1" } -aster = { version = "0.17", default-features = false } -quasi = { version = "0.11", default-features = false } -quasi_macros = { version = "0.11", optional = true } -syntex = { version = "0.33", optional = true } -syntex_syntax = { version = "0.33", optional = true } +aster = { version = "0.41", default-features = false } +quasi = { version = "0.32", default-features = false } +quasi_macros = { version = "0.32", optional = true } +syntex = { version = "0.58", optional = true } +syntex_syntax = { version = "0.58", optional = true } clippy = { version = "0.0.90", optional = true } [features] diff --git a/dapps/js-glue/build.rs b/dapps/js-glue/build.rs index 12afa7974..442abf7df 100644 --- a/dapps/js-glue/build.rs +++ b/dapps/js-glue/build.rs @@ -25,13 +25,11 @@ mod inner { pub fn main() { let out_dir = env::var_os("OUT_DIR").unwrap(); - let mut registry = syntex::Registry::new(); - quasi_codegen::register(&mut registry); let src = Path::new("src/lib.rs.in"); let dst = Path::new(&out_dir).join("lib.rs"); - registry.expand("", &src, &dst).unwrap(); + quasi_codegen::expand(&src, &dst).unwrap(); } } diff --git a/dapps/js-glue/src/build.rs b/dapps/js-glue/src/build.rs index 86c93171b..31f27306a 100644 --- a/dapps/js-glue/src/build.rs +++ b/dapps/js-glue/src/build.rs @@ -13,9 +13,8 @@ pub mod inner { impl fold::Folder for StripAttributeFolder { fn fold_attribute(&mut self, attr: ast::Attribute) -> Option { - match attr.node.value.node { - ast::MetaItemKind::List(ref n, _) if n == &"webapp" => { return None; } - _ => {} + if &*attr.value.name.as_str() == "webapp" { + return None; } Some(attr) diff --git a/dapps/js-glue/src/codegen.rs b/dapps/js-glue/src/codegen.rs index e74ad5fbe..3d8c93460 100644 --- a/dapps/js-glue/src/codegen.rs +++ b/dapps/js-glue/src/codegen.rs @@ -22,16 +22,12 @@ use self::mime_guess::guess_mime_type; use std::path::{self, Path, PathBuf}; use std::ops::Deref; -use syntax::ast::{MetaItem, Item}; - -use syntax::ast; use syntax::attr; +use syntax::ast::{self, MetaItem, Item}; use syntax::codemap::Span; use syntax::ext::base::{Annotatable, ExtCtxt}; -use syntax::ptr::P; -use syntax::print::pprust::{lit_to_string}; -use syntax::parse::token::{InternedString}; - +use syntax::print::pprust::lit_to_string; +use syntax::symbol::InternedString; pub fn expand_webapp_implementation( cx: &mut ExtCtxt, @@ -48,7 +44,7 @@ pub fn expand_webapp_implementation( }, }; let builder = aster::AstBuilder::new().span(span); - implement_webapp(cx, &builder, &item, push); + implement_webapp(cx, &builder, item, push); } fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable)) { @@ -117,11 +113,12 @@ fn implement_webapp(cx: &ExtCtxt, builder: &aster::AstBuilder, item: &Item, push } fn extract_path(cx: &ExtCtxt, item: &Item) -> String { - for meta_items in item.attrs().iter().filter_map(webapp_meta_items) { + for meta_items in item.attrs.iter().filter_map(webapp_meta_items) { for meta_item in meta_items { + let is_path = &*meta_item.name.as_str() == "path"; match meta_item.node { - ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"path" => { - if let Some(s) = get_str_from_lit(cx, name, lit) { + ast::MetaItemKind::NameValue(ref lit) if is_path => { + if let Some(s) = get_str_from_lit(cx, lit) { return s.deref().to_owned(); } }, @@ -134,14 +131,32 @@ fn extract_path(cx: &ExtCtxt, item: &Item) -> String { "web".to_owned() } -fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option { +fn webapp_meta_items(attr: &ast::Attribute) -> Option> { + let is_webapp = &*attr.value.name.as_str() == "webapp"; + match attr.value.node { + ast::MetaItemKind::List(ref items) if is_webapp => { + attr::mark_used(&attr); + Some( + items.iter() + .map(|item| item.node.clone()) + .filter_map(|item| match item { + ast::NestedMetaItemKind::MetaItem(item) => Some(item), + _ => None, + }) + .collect() + ) + } + _ => None + } +} + +fn get_str_from_lit(cx: &ExtCtxt, lit: &ast::Lit) -> Option { match lit.node { - ast::LitKind::Str(ref s, _) => Some(s.clone()), + ast::LitKind::Str(ref s, _) => Some(s.clone().as_str()), _ => { cx.span_err( lit.span, - &format!("webapp annotation `{}` must be a string, not `{}`", - name, + &format!("webapp annotation path must be a string, not `{}`", lit_to_string(lit) ) ); @@ -150,16 +165,6 @@ fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Option Option<&[P]> { - match attr.node.value.node { - ast::MetaItemKind::List(ref name, ref items) if name == &"webapp" => { - attr::mark_used(&attr); - Some(items) - } - _ => None - } -} - fn as_uri(path: &Path) -> String { let mut s = String::new(); for component in path.iter() { @@ -169,7 +174,6 @@ fn as_uri(path: &Path) -> String { s[0..s.len()-1].into() } - #[test] fn should_convert_path_separators_on_all_platforms() { // given diff --git a/dapps/js-glue/src/lib.rs b/dapps/js-glue/src/lib.rs index 72f228481..143dd1fc8 100644 --- a/dapps/js-glue/src/lib.rs +++ b/dapps/js-glue/src/lib.rs @@ -22,7 +22,6 @@ extern crate syntex; #[cfg(feature = "with-syntex")] -#[macro_use] extern crate syntex_syntax as syntax; #[cfg(feature = "with-syntex")] diff --git a/ipc/codegen/Cargo.toml b/ipc/codegen/Cargo.toml index 63e0fc7c6..52016f45a 100644 --- a/ipc/codegen/Cargo.toml +++ b/ipc/codegen/Cargo.toml @@ -14,13 +14,13 @@ nightly-testing = ["clippy"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] [build-dependencies] -quasi_codegen = { version = "0.11", optional = true } -syntex = { version = "0.33", optional = true } +quasi_codegen = { version = "0.32", optional = true } +syntex = { version = "0.58", optional = true } [dependencies] -aster = { version = "0.17", default-features = false } +aster = { version = "0.41", default-features = false } clippy = { version = "^0.*", optional = true } -quasi = { version = "0.11", default-features = false } -quasi_macros = { version = "0.11", optional = true } -syntex = { version = "0.33", optional = true } -syntex_syntax = { version = "0.33", optional = true } +quasi = { version = "0.32", default-features = false } +quasi_macros = { version = "0.32", optional = true } +syntex = { version = "0.58", optional = true } +syntex_syntax = { version = "0.58", optional = true } diff --git a/ipc/codegen/build.rs b/ipc/codegen/build.rs index 12afa7974..442abf7df 100644 --- a/ipc/codegen/build.rs +++ b/ipc/codegen/build.rs @@ -25,13 +25,11 @@ mod inner { pub fn main() { let out_dir = env::var_os("OUT_DIR").unwrap(); - let mut registry = syntex::Registry::new(); - quasi_codegen::register(&mut registry); let src = Path::new("src/lib.rs.in"); let dst = Path::new(&out_dir).join("lib.rs"); - registry.expand("", &src, &dst).unwrap(); + quasi_codegen::expand(&src, &dst).unwrap(); } } diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs index d44a8137d..2f4752d97 100644 --- a/ipc/codegen/src/codegen.rs +++ b/ipc/codegen/src/codegen.rs @@ -56,7 +56,7 @@ pub fn expand_ipc_implementation( let builder = aster::AstBuilder::new().span(span); - let interface_map = match implement_interface(cx, &builder, &item, push) { + let interface_map = match implement_interface(cx, &builder, &item, push, meta_item) { Ok(interface_map) => interface_map, Err(Error) => { return; }, }; @@ -99,9 +99,9 @@ fn push_invoke_signature_aster( let inputs = &named_signature.sig.decl.inputs; let (input_type_name, input_arg_names, input_arg_tys) = if inputs.len() > 0 { let first_field_name = field_name(builder, &inputs[0]).name.as_str(); - if first_field_name == "self" && inputs.len() == 1 { (None, vec![], vec![]) } + if &*first_field_name == "self" && inputs.len() == 1 { (None, vec![], vec![]) } else { - let skip = if first_field_name == "self" { 2 } else { 1 }; + let skip = if &*first_field_name == "self" { 2 } else { 1 }; let name_str = format!("{}_input", named_signature.ident.name.as_str()); let mut arg_names = Vec::new(); @@ -181,6 +181,7 @@ fn implement_dispatch_arm_invoke_stmt( dispatch: &Dispatch, ) -> ast::Stmt { + use ::syntax::tokenstream::TokenTree::Token; let function_name = builder.id(dispatch.function_name.as_str()); let input_args_exprs = dispatch.input_arg_names.iter().enumerate().map(|(arg_index, arg_name)| { @@ -193,56 +194,56 @@ fn implement_dispatch_arm_invoke_stmt( let ext_cx = &*cx; ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( ext_cx.parse_sess(), - ext_cx.cfg(), { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); if dispatch.return_type_ty.is_some() { - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); + tt.push(Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc")))); + tt.push(Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary")))); + tt.push(Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize")))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); } - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); + tt.push(Token(_sp, ::syntax::parse::token::Dot)); tt.extend(::quasi::ToTokens::to_tokens(&function_name, ext_cx).into_iter()); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); for arg_expr in input_args_exprs { tt.extend(::quasi::ToTokens::to_tokens(&arg_expr, ext_cx).into_iter()); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); + tt.push(Token(_sp, ::syntax::parse::token::Comma)); } - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); if dispatch.return_type_ty.is_some() { - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Dot)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::Dot)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap")))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); } else { - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Semi)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Vec")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("new")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::Semi)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Vec")))); + tt.push(Token(_sp, ::syntax::parse::token::ModSep)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("new")))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); } - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); tt - })).unwrap() + } + )).unwrap() } fn implement_dispatch_arm_invoke( @@ -344,6 +345,8 @@ fn implement_client_method_body( interface_map: &InterfaceMap, ) -> P { + use ::syntax::tokenstream::TokenTree::Token; + let dispatch = &interface_map.dispatches[index as usize]; let index_ident = builder.id(format!("{}", index + RESERVED_MESSAGE_IDS).as_str()); @@ -391,26 +394,25 @@ fn implement_client_method_body( let ext_cx = &*cx; ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( ext_cx.parse_sess(), - ext_cx.cfg(), { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Eq)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let")))); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload")))); + tt.push(Token(_sp, ::syntax::parse::token::Eq)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request")))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); for arg in dispatch.input_arg_names.iter() { - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon)); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); + tt.push(Token(_sp, ::syntax::parse::token::Colon)); + tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); + tt.push(Token(_sp, ::syntax::parse::token::Comma)); } - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); tt })) }); @@ -465,6 +467,8 @@ fn implement_client_method( ) -> ast::ImplItem { + use ::syntax::tokenstream::TokenTree::Token; + let dispatch = &interface_map.dispatches[index as usize]; let method_name = builder.id(dispatch.function_name.as_str()); let body = implement_client_method_body(cx, builder, index, interface_map); @@ -476,36 +480,35 @@ fn implement_client_method( let signature = ::syntax::parse::parser::Parser::parse_impl_item( &mut ::syntax::parse::new_parser_from_tts( ext_cx.parse_sess(), - ext_cx.cfg(), { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn")))); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn")))); tt.extend(::quasi::ToTokens::to_tokens(&method_name, ext_cx).into_iter()); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); + tt.push(Token(_sp, ::syntax::parse::token::Comma)); for arg_idx in 0..dispatch.input_arg_names.len() { let arg_name = dispatch.input_arg_names[arg_idx].as_str(); let arg_ty = dispatch.input_arg_tys[arg_idx].clone(); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name)))); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Colon)); + tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name)))); + tt.push(Token(_sp, ::syntax::parse::token::Colon)); tt.extend(::quasi::ToTokens::to_tokens(&arg_ty, ext_cx).into_iter()); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::Comma)); + tt.push(Token(_sp, ::syntax::parse::token::Comma)); } - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); if let Some(ref return_ty) = dispatch.return_type_ty { - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::RArrow)); + tt.push(Token(_sp, ::syntax::parse::token::RArrow)); tt.extend(::quasi::ToTokens::to_tokens(return_ty, ext_cx).into_iter()); } - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); + tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); tt.extend(::quasi::ToTokens::to_tokens(&body, ext_cx).into_iter()); - tt.push(::syntax::ast::TokenTree::Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); + tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); tt })); @@ -526,7 +529,7 @@ fn client_generics(builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> fn client_qualified_ident(cx: &ExtCtxt, builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> P { let generics = client_generics(builder, interface_map); - aster::ty::TyBuilder::new().path().segment(interface_map.ident_map.client_ident(cx, builder, &interface_map.original_item)) + aster::ty::TyBuilder::new().path().segment(interface_map.ident_map.client_ident(cx, builder)) .with_generics(generics).build() .build() } @@ -542,7 +545,7 @@ fn client_phantom_ident(builder: &aster::AstBuilder, interface_map: &InterfaceMa /// for say `Service` it generates `ServiceClient` fn push_client_struct(cx: &ExtCtxt, builder: &aster::AstBuilder, interface_map: &InterfaceMap, push: &mut FnMut(Annotatable)) { let generics = client_generics(builder, interface_map); - let client_short_ident = interface_map.ident_map.client_ident(cx, builder, &interface_map.original_item); + let client_short_ident = interface_map.ident_map.client_ident(cx, builder); let phantom = client_phantom_ident(builder, interface_map); let client_struct_item = quote_item!(cx, @@ -575,7 +578,7 @@ fn push_with_socket_client_implementation( let generics = client_generics(builder, interface_map); let client_ident = client_qualified_ident(cx, builder, interface_map); let where_clause = &generics.where_clause; - let client_short_ident = interface_map.ident_map.client_ident(cx, builder, &interface_map.original_item); + let client_short_ident = interface_map.ident_map.client_ident(cx, builder); let implement = quote_item!(cx, impl $generics ::ipc::WithSocket for $client_ident $where_clause { @@ -717,33 +720,31 @@ fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result Option<&[P]> { - match attr.node.value.node { - ast::MetaItemKind::List(ref name, ref items) if name == &"ipc" => { - Some(items) - } - _ => None - } -} - -fn client_ident_renamed(cx: &ExtCtxt, item: &ast::Item) -> Option { - for meta_items in item.attrs().iter().filter_map(get_ipc_meta_items) { - for meta_item in meta_items { - match meta_item.node { - ast::MetaItemKind::NameValue(ref name, ref lit) if name == &"client_ident" => { - if let Ok(s) = get_str_from_lit(cx, name, lit) { - return Some(s); +fn client_ident_renamed(cx: &ExtCtxt, meta_item: &MetaItem) -> Option { + if let ast::MetaItemKind::List(ref list) = meta_item.node { + for nested in list { + match nested.node { + ast::NestedMetaItemKind::MetaItem(ref meta_item) => { + let is_client_ident = &*meta_item.name.as_str() == "client_ident"; + match meta_item.node { + ast::MetaItemKind::NameValue(ref lit) if is_client_ident => { + if let Ok(s) = get_str_from_lit(cx, "client_ident", lit) { + return Some(s); + } + } + _ => { + cx.span_err( + meta_item.span, + &format!("unknown client_ident container attribute `{}`", + ::syntax::print::pprust::meta_item_to_string(&meta_item))); + } } - } - _ => { - cx.span_err( - meta_item.span, - &format!("unknown client_ident container attribute `{}`", - ::syntax::print::pprust::meta_item_to_string(meta_item))); - } + }, + _ => {}, } } } + None } @@ -759,6 +760,7 @@ struct InterfaceMap { struct IdentMap { original_path: ast::Path, + meta_item: MetaItem, } impl IdentMap { @@ -766,8 +768,8 @@ impl IdentMap { builder.id(format!("{}", ::syntax::print::pprust::path_to_string(&self.original_path))) } - fn client_ident(&self, cx: &ExtCtxt, builder: &aster::AstBuilder, item: &ast::Item) -> Ident { - if let Some(new_name) = client_ident_renamed(cx, item) { + fn client_ident(&self, cx: &ExtCtxt, builder: &aster::AstBuilder) -> Ident { + if let Some(new_name) = client_ident_renamed(cx, &self.meta_item) { builder.id(new_name) } else { @@ -776,12 +778,12 @@ impl IdentMap { } } -fn ty_ident_map(original_ty: &P) -> IdentMap { +fn ty_ident_map(original_ty: &P, meta_item: &MetaItem) -> IdentMap { let original_path = match original_ty.node { ::syntax::ast::TyKind::Path(_, ref path) => path.clone(), _ => { panic!("incompatible implementation"); } }; - let ident_map = IdentMap { original_path: original_path }; + let ident_map = IdentMap { original_path: original_path, meta_item: meta_item.clone() }; ident_map } @@ -791,6 +793,7 @@ fn implement_interface( builder: &aster::AstBuilder, item: &Item, push: &mut FnMut(Annotatable), + meta_item: &MetaItem, ) -> Result { let (generics, impl_trait, original_ty, dispatch_table) = match item.node { ast::ItemKind::Impl(_, _, ref generics, ref impl_trait, ref ty, ref impl_items) => { @@ -844,7 +847,7 @@ fn implement_interface( let (handshake_arm, handshake_arm_buf) = implement_handshake_arm(cx); - let ty = ty_ident_map(&original_ty).ident(builder); + let ty = ty_ident_map(&original_ty, meta_item).ident(builder); let (interface_endpoint, host_generics) = match impl_trait { Some(ref trait_) => (builder.id(::syntax::print::pprust::path_to_string(&trait_.path)), None), None => (ty, Some(&impl_generics)), @@ -884,7 +887,7 @@ fn implement_interface( ).unwrap(); Ok(InterfaceMap { - ident_map: ty_ident_map(&original_ty), + ident_map: ty_ident_map(&original_ty, meta_item), original_item: item.clone(), item: ipc_item, dispatches: dispatch_table, diff --git a/ipc/codegen/src/lib.rs b/ipc/codegen/src/lib.rs index 33894b485..6e7fc441b 100644 --- a/ipc/codegen/src/lib.rs +++ b/ipc/codegen/src/lib.rs @@ -66,9 +66,11 @@ struct StripAttributeFolder<'a> { #[cfg(feature = "with-syntex")] impl<'a> fold::Folder for StripAttributeFolder<'a> { fn fold_attribute(&mut self, attr: ast::Attribute) -> Option { - match attr.node.value.node { - ast::MetaItemKind::List(ref n, _) if n == self.attr_title => { return None; } - ast::MetaItemKind::Word(ref n) if n == self.attr_title => { return None; } + let is_self = &*attr.value.name.as_str() == self.attr_title; + + match attr.value.node { + ast::MetaItemKind::List(_) if is_self => { return None; } + ast::MetaItemKind::Word if is_self => { return None; } _ => {} } diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs index cf1ec6696..fd908725c 100644 --- a/ipc/codegen/src/serialization.rs +++ b/ipc/codegen/src/serialization.rs @@ -151,7 +151,7 @@ fn binary_expr( _ => { cx.span_bug(item.span, "expected ItemStruct or ItemEnum in #[derive(Binary)]"); - Err(Error) + Err(Error) as Result }, } } @@ -184,13 +184,17 @@ fn binary_expr_struct( let size_exprs: Vec> = fields.iter().enumerate().map(|(index, field)| { let raw_ident = ::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)); let index_ident = builder.id(format!("__field{}", index)); + let field_id = match field.ident { + Some(ident) => builder.id(ident), + None => builder.id(format!("{}", index)), + }; + match raw_ident.as_ref() { "u8" => { quote_expr!(cx, 1) }, "[u8]" => { value_ident.and_then(|x| { - let field_id = builder.id(field.ident.unwrap()); Some(quote_expr!(cx, $x. $field_id .len())) }) .unwrap_or_else(|| { @@ -207,7 +211,6 @@ fn binary_expr_struct( value_ident.and_then(|x| { - let field_id = builder.id(field.ident.unwrap()); Some(quote_expr!(cx, match $field_type_ident_qualified::len_params() { 0 => ::std::mem::size_of::<$field_type_ident>(), @@ -232,12 +235,12 @@ fn binary_expr_struct( } let mut write_stmts = Vec::::new(); - write_stmts.push(quote_stmt!(cx, let mut offset = 0usize;).unwrap()); + write_stmts.push(quote_stmt!(cx, let mut offset = 0usize;).expect("stmt1")); let mut map_stmts = Vec::::new(); let field_amount = builder.id(&format!("{}",fields.len())); - map_stmts.push(quote_stmt!(cx, let mut map = vec![0usize; $field_amount];).unwrap()); - map_stmts.push(quote_stmt!(cx, let mut total = 0usize;).unwrap()); + map_stmts.push(quote_stmt!(cx, let mut map = vec![0usize; $field_amount];).expect("stmt2")); + map_stmts.push(quote_stmt!(cx, let mut total = 0usize;).expect("stmt3")); let mut post_write_stmts = Vec::::new(); @@ -248,9 +251,12 @@ fn binary_expr_struct( let field_type_ident_qualified = builder.id( replace_qualified(&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)))); + let field_id = match field.ident { + Some(ident) => builder.id(ident), + None => builder.id(format!("{}", index)), + }; let member_expr = match value_ident { Some(x) => { - let field_id = builder.id(field.ident.unwrap()); quote_expr!(cx, $x . $field_id) }, None => { @@ -267,8 +273,8 @@ fn binary_expr_struct( match raw_ident.as_ref() { "u8" => { - write_stmts.push(quote_stmt!(cx, let next_line = offset + 1;).unwrap()); - write_stmts.push(quote_stmt!(cx, buffer[offset] = $member_expr; ).unwrap()); + write_stmts.push(quote_stmt!(cx, let next_line = offset + 1;).expect("stmt4")); + write_stmts.push(quote_stmt!(cx, buffer[offset] = $member_expr; ).expect("stm5")); }, "[u8]" => { write_stmts.push(quote_stmt!(cx, let size = $member_expr .len();).unwrap()); @@ -374,7 +380,7 @@ fn binary_expr_item_struct( cx.span_bug(span, &format!("#[derive(Binary)] Unsupported struct content, expected tuple/struct, found: {:?}", variant_data)); - Err(Error) + Err(Error) as Result }, } } @@ -431,13 +437,12 @@ fn fields_sequence( variant_ident: &ast::Ident, ) -> ast::Expr { use syntax::parse::token; - use syntax::ast::TokenTree::Token; + use syntax::tokenstream::TokenTree::Token; let named_members = fields.iter().any(|f| f.ident.is_some()); ::quasi::parse_expr_panic(&mut ::syntax::parse::new_parser_from_tts( ext_cx.parse_sess(), - ext_cx.cfg(), { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); @@ -569,11 +574,10 @@ fn named_fields_sequence( fields: &[ast::StructField], ) -> ast::Stmt { use syntax::parse::token; - use syntax::ast::TokenTree::Token; + use syntax::tokenstream::TokenTree::Token; ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( ext_cx.parse_sess(), - ext_cx.cfg(), { let _sp = ext_cx.call_site(); let mut tt = ::std::vec::Vec::new(); @@ -590,7 +594,10 @@ fn named_fields_sequence( tt.push(Token(_sp, token::OpenDelim(token::Brace))); for (idx, field) in fields.iter().enumerate() { - tt.push(Token(_sp, token::Ident(field.ident.clone().expect("function is called for named fields")))); + tt.push(Token(_sp, match field.ident { + Some(ident) => token::Ident(ident), + None => token::Ident(ext_cx.ident_of(&format!("{}", idx))), + })); tt.push(Token(_sp, token::Colon)); // special case for u8, it just takes byte form sequence diff --git a/js/Cargo.precompiled.toml b/js/Cargo.precompiled.toml index 5de652037..87369005c 100644 --- a/js/Cargo.precompiled.toml +++ b/js/Cargo.precompiled.toml @@ -12,8 +12,8 @@ use-precompiled-js = ["parity-dapps-glue/use-precompiled-js"] with-syntex = ["parity-dapps-glue/with-syntex"] [build-dependencies] -parity-dapps-glue = "1.4" +parity-dapps-glue = "1.7" [dependencies] -parity-dapps-glue = "1.4" +parity-dapps-glue = "1.7" diff --git a/js/Cargo.toml b/js/Cargo.toml index 231f5fa24..71683b899 100644 --- a/js/Cargo.toml +++ b/js/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Parity built-in dapps." name = "parity-ui-dev" -version = "1.4.0" +version = "1.7.0" license = "GPL-3.0" authors = ["Parity Technologies "] build = "build.rs" @@ -11,8 +11,8 @@ default = ["with-syntex"] with-syntex = ["parity-dapps-glue/with-syntex"] [build-dependencies] -parity-dapps-glue = "1.4" +parity-dapps-glue = "1.7" [dependencies] -parity-dapps-glue = "1.4" +parity-dapps-glue = "1.7" diff --git a/signer/Cargo.toml b/signer/Cargo.toml index 3c81bfc9d..4b80cfac5 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -15,7 +15,7 @@ rand = "0.3.14" jsonrpc-core = { git = "https://github.com/ethcore/jsonrpc.git", branch = "parity-1.6" } log = "0.3" env_logger = "0.3" -parity-dapps-glue = { version = "1.4", optional = true } +parity-dapps-glue = { version = "1.7", optional = true } ws = { git = "https://github.com/ethcore/ws-rs.git", branch = "mio-upstream-stable" } ethcore-util = { path = "../util" } ethcore-io = { path = "../util/io" } diff --git a/stratum/src/traits.rs b/stratum/src/traits.rs index af5be2cbc..c2c522b3b 100644 --- a/stratum/src/traits.rs +++ b/stratum/src/traits.rs @@ -42,8 +42,8 @@ impl From for Error { } } -#[ipc(client_ident="RemoteJobDispatcher")] /// Interface that can provide pow/blockchain-specific responses for the clients +#[ipc(client_ident="RemoteJobDispatcher")] pub trait JobDispatcher: Send + Sync { // json for initial client handshake fn initial(&self) -> Option { None } @@ -55,8 +55,8 @@ pub trait JobDispatcher: Send + Sync { fn submit(&self, payload: Vec) -> Result<(), Error>; } -#[ipc(client_ident="RemoteWorkHandler")] /// Interface that can handle requests to push job for workers +#[ipc(client_ident="RemoteWorkHandler")] pub trait PushWorkHandler: Send + Sync { /// push the same work package for all workers (`payload`: json of pow-specific set of work specification) fn push_work_all(&self, payload: String) -> Result<(), Error>;