]> git.lizzy.rs Git - rust.git/commitdiff
Merge #3958
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Thu, 16 Apr 2020 20:21:59 +0000 (20:21 +0000)
committerGitHub <noreply@github.com>
Thu, 16 Apr 2020 20:21:59 +0000 (20:21 +0000)
3958: Add proc-macro related config and tests r=matklad a=edwin0cheng

This PR do the following things:

1. Add cli argument `proc-macro` for running proc-macro server.
2. Added support for proc-macro in bench and analysis-stats
3. Added typescript config for proc-macros
4. Added an heavy test for proc-macros.

To test it out:

1. run `cargo xtask install --proc-macro`
2. add `"rust-analyzer.cargo.loadOutDirsFromCheck": true"` and `"rust-analyzer.procMacro.enabled": true"` in vs code config.

[Edit] Change to use `rust-analyzer proc-macro` for running proc-macro standalone process.

Co-authored-by: Edwin Cheng <edwin0cheng@gmail.com>
1  2 
Cargo.lock

diff --combined Cargo.lock
index 2a12d9f5b30c8d7a662b4c682c214f3d9c3a8cc2,8e204d39ff28032b50bb6181ae24abb16c392728..89a734c9bb935cae217aa20213debe4aaff6fe9c
@@@ -114,7 -114,7 +114,7 @@@ checksum = "4785bdd1c96b2a846b2bd7cc02e
  [[package]]
  name = "chalk-derive"
  version = "0.1.0"
 -source = "git+https://github.com/rust-lang/chalk.git?rev=6222e416b96892b2a86bc08de7dbc9826ff1acea#6222e416b96892b2a86bc08de7dbc9826ff1acea"
 +source = "git+https://github.com/rust-lang/chalk.git?rev=28cef6ff403d403e6ad2f3d27d944e9ffac1bce8#28cef6ff403d403e6ad2f3d27d944e9ffac1bce8"
  dependencies = [
   "proc-macro2",
   "quote",
  [[package]]
  name = "chalk-engine"
  version = "0.9.0"
 -source = "git+https://github.com/rust-lang/chalk.git?rev=6222e416b96892b2a86bc08de7dbc9826ff1acea#6222e416b96892b2a86bc08de7dbc9826ff1acea"
 +source = "git+https://github.com/rust-lang/chalk.git?rev=28cef6ff403d403e6ad2f3d27d944e9ffac1bce8#28cef6ff403d403e6ad2f3d27d944e9ffac1bce8"
  dependencies = [
   "chalk-macros",
   "rustc-hash",
  [[package]]
  name = "chalk-ir"
  version = "0.1.0"
 -source = "git+https://github.com/rust-lang/chalk.git?rev=6222e416b96892b2a86bc08de7dbc9826ff1acea#6222e416b96892b2a86bc08de7dbc9826ff1acea"
 +source = "git+https://github.com/rust-lang/chalk.git?rev=28cef6ff403d403e6ad2f3d27d944e9ffac1bce8#28cef6ff403d403e6ad2f3d27d944e9ffac1bce8"
  dependencies = [
   "chalk-derive",
   "chalk-engine",
  [[package]]
  name = "chalk-macros"
  version = "0.1.1"
 -source = "git+https://github.com/rust-lang/chalk.git?rev=6222e416b96892b2a86bc08de7dbc9826ff1acea#6222e416b96892b2a86bc08de7dbc9826ff1acea"
 +source = "git+https://github.com/rust-lang/chalk.git?rev=28cef6ff403d403e6ad2f3d27d944e9ffac1bce8#28cef6ff403d403e6ad2f3d27d944e9ffac1bce8"
  dependencies = [
   "lazy_static",
  ]
  [[package]]
  name = "chalk-rust-ir"
  version = "0.1.0"
 -source = "git+https://github.com/rust-lang/chalk.git?rev=6222e416b96892b2a86bc08de7dbc9826ff1acea#6222e416b96892b2a86bc08de7dbc9826ff1acea"
 +source = "git+https://github.com/rust-lang/chalk.git?rev=28cef6ff403d403e6ad2f3d27d944e9ffac1bce8#28cef6ff403d403e6ad2f3d27d944e9ffac1bce8"
  dependencies = [
   "chalk-derive",
   "chalk-engine",
  [[package]]
  name = "chalk-solve"
  version = "0.1.0"
 -source = "git+https://github.com/rust-lang/chalk.git?rev=6222e416b96892b2a86bc08de7dbc9826ff1acea#6222e416b96892b2a86bc08de7dbc9826ff1acea"
 +source = "git+https://github.com/rust-lang/chalk.git?rev=28cef6ff403d403e6ad2f3d27d944e9ffac1bce8#28cef6ff403d403e6ad2f3d27d944e9ffac1bce8"
  dependencies = [
   "chalk-derive",
   "chalk-engine",
@@@ -447,9 -447,9 +447,9 @@@ dependencies = 
  
  [[package]]
  name = "hermit-abi"
 -version = "0.1.10"
 +version = "0.1.11"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "725cf19794cf90aa94e65050cb4191ff5d8fa87a498383774c47b332e3af952e"
 +checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15"
  dependencies = [
   "libc",
  ]
@@@ -594,15 -594,15 +594,15 @@@ checksum = "b294d6fa9ee409a054354afc435
  
  [[package]]
  name = "libc"
 -version = "0.2.68"
 +version = "0.2.69"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
 +checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
  
  [[package]]
  name = "libloading"
 -version = "0.6.0"
 +version = "0.6.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "2c979a19ffb457f0273965c333053f3d586bf759bf7b683fbebc37f9a9ebedc4"
 +checksum = "3c4f51b790f5bdb65acb4cc94bb81d7b2ee60348a5431ac1467d390b017600b0"
  dependencies = [
   "winapi 0.3.8",
  ]
@@@ -758,9 -758,9 +758,9 @@@ dependencies = 
  
  [[package]]
  name = "num_cpus"
 -version = "1.12.0"
 +version = "1.13.0"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
 +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
  dependencies = [
   "hermit-abi",
   "libc",
@@@ -780,9 -780,9 +780,9 @@@ checksum = "a86ed3f5f244b372d6b1a00b72e
  
  [[package]]
  name = "parking_lot"
 -version = "0.10.1"
 +version = "0.10.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "6fdfcb5f20930a79e326f7ec992a9fdb5b7bd809254b1e735bdd5a99f78bee0d"
 +checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
  dependencies = [
   "lock_api",
   "parking_lot_core",
@@@ -1341,6 -1341,7 +1341,7 @@@ dependencies = 
   "ra_hir_def",
   "ra_hir_ty",
   "ra_ide",
+  "ra_proc_macro_srv",
   "ra_prof",
   "ra_project_model",
   "ra_syntax",