aboutsummaryrefslogtreecommitdiff
path: root/Cargo.lock
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-04-11 12:49:07 +0100
committerGitHub <[email protected]>2020-04-11 12:49:07 +0100
commit0ecdba20df41a800222d0fd864843843feb6e875 (patch)
treef8c96eaece90cd0630075e2693f833e4385404f7 /Cargo.lock
parent54bdb9c78b012c560efc142971dc3e724989e807 (diff)
parent31d163aa3be9c938ffe713534e4f648550a35f6c (diff)
Merge #3920
3920: Implement expand_task and list_macros in proc_macro_srv r=matklad a=edwin0cheng This PR finish up the remain `proc_macro_srv` implementation : 1. Added dylib loading code for proc-macro crate dylib. Note that we have to add some special flags for unix loading because of a bug in old version of glibc, see https://github.com/fedochet/rust-proc-macro-panic-inside-panic-expample/issues/1 and https://github.com/rust-lang/rust/issues/60593 for details. 2. Added tests for proc-macro expansion: We use a trick here by adding `serde_derive` to dev-dependencies and calling `cargo-metadata` for searching its dylib path, and expand it in our tests. [EDIT] Note that this PR **DO NOT** implement the final glue code with rust-analzyer and proc-macro-srv yet. Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock49
1 files changed, 49 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 34c535162..975c1aef8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -425,6 +425,17 @@ dependencies = [
425] 425]
426 426
427[[package]] 427[[package]]
428name = "goblin"
429version = "0.2.1"
430source = "registry+https://github.com/rust-lang/crates.io-index"
431checksum = "ddd5e3132801a1ac34ac53b97acde50c4685414dd2f291b9ea52afa6f07468c8"
432dependencies = [
433 "log",
434 "plain",
435 "scroll",
436]
437
438[[package]]
428name = "heck" 439name = "heck"
429version = "0.3.1" 440version = "0.3.1"
430source = "registry+https://github.com/rust-lang/crates.io-index" 441source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -587,6 +598,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
587checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" 598checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
588 599
589[[package]] 600[[package]]
601name = "libloading"
602version = "0.6.0"
603source = "registry+https://github.com/rust-lang/crates.io-index"
604checksum = "2c979a19ffb457f0273965c333053f3d586bf759bf7b683fbebc37f9a9ebedc4"
605dependencies = [
606 "winapi 0.3.8",
607]
608
609[[package]]
590name = "linked-hash-map" 610name = "linked-hash-map"
591version = "0.5.2" 611version = "0.5.2"
592source = "registry+https://github.com/rust-lang/crates.io-index" 612source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -826,6 +846,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
826checksum = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc" 846checksum = "3ad1f1b834a05d42dae330066e9699a173b28185b3bdc3dbf14ca239585de8cc"
827 847
828[[package]] 848[[package]]
849name = "plain"
850version = "0.2.3"
851source = "registry+https://github.com/rust-lang/crates.io-index"
852checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
853
854[[package]]
829name = "ppv-lite86" 855name = "ppv-lite86"
830version = "0.2.6" 856version = "0.2.6"
831source = "registry+https://github.com/rust-lang/crates.io-index" 857source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1082,10 +1108,13 @@ version = "0.1.0"
1082dependencies = [ 1108dependencies = [
1083 "cargo_metadata", 1109 "cargo_metadata",
1084 "difference", 1110 "difference",
1111 "goblin",
1112 "libloading",
1085 "ra_mbe", 1113 "ra_mbe",
1086 "ra_proc_macro", 1114 "ra_proc_macro",
1087 "ra_tt", 1115 "ra_tt",
1088 "serde_derive", 1116 "serde_derive",
1117 "test_utils",
1089] 1118]
1090 1119
1091[[package]] 1120[[package]]
@@ -1404,6 +1433,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1404checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" 1433checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
1405 1434
1406[[package]] 1435[[package]]
1436name = "scroll"
1437version = "0.10.1"
1438source = "registry+https://github.com/rust-lang/crates.io-index"
1439checksum = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
1440dependencies = [
1441 "scroll_derive",
1442]
1443
1444[[package]]
1445name = "scroll_derive"
1446version = "0.10.1"
1447source = "registry+https://github.com/rust-lang/crates.io-index"
1448checksum = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
1449dependencies = [
1450 "proc-macro2",
1451 "quote",
1452 "syn",
1453]
1454
1455[[package]]
1407name = "semver" 1456name = "semver"
1408version = "0.9.0" 1457version = "0.9.0"
1409source = "registry+https://github.com/rust-lang/crates.io-index" 1458source = "registry+https://github.com/rust-lang/crates.io-index"