13 files changed, 26 insertions, 19 deletions

diff --git a/crates/ra_proc_macro/Cargo.toml b/crates/proc_macro_api/Cargo.toml
index d2d1bc228..c1abb5627 100644
--- a/crates/ra_proc_macro/Cargo.toml
+++ b/crates/proc_macro_api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2018"
-name = "ra_proc_macro"
+name = "proc_macro_api"
 version = "0.1.0"
 authors = ["rust-analyzer developers"]
 publish = false
@@ -10,9 +10,10 @@ license = "MIT OR Apache-2.0"
 doctest = false
 
 [dependencies]
-tt = { path = "../tt" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 log = "0.4.8"
 crossbeam-channel = "0.4.0"
 jod-thread = "0.1.1"
+
+tt = { path = "../tt" }
diff --git a/crates/ra_proc_macro/src/lib.rs b/crates/proc_macro_api/src/lib.rs
index 15db57eb2..15db57eb2 100644
--- a/crates/ra_proc_macro/src/lib.rs
+++ b/crates/proc_macro_api/src/lib.rs
diff --git a/crates/ra_proc_macro/src/msg.rs b/crates/proc_macro_api/src/msg.rs
index f84ebdbc5..f84ebdbc5 100644
--- a/crates/ra_proc_macro/src/msg.rs
+++ b/crates/proc_macro_api/src/msg.rs
diff --git a/crates/ra_proc_macro/src/process.rs b/crates/proc_macro_api/src/process.rs
index 51ffcaa78..51ffcaa78 100644
--- a/crates/ra_proc_macro/src/process.rs
+++ b/crates/proc_macro_api/src/process.rs
diff --git a/crates/ra_proc_macro/src/rpc.rs b/crates/proc_macro_api/src/rpc.rs
index 5e5d78d06..47624163e 100644
--- a/crates/ra_proc_macro/src/rpc.rs
+++ b/crates/proc_macro_api/src/rpc.rs
@@ -1,4 +1,4 @@
-//! Data struture serialization related stuff for RPC
+//! Data structure serialization related stuff for RPC
 //!
 //! Defines all necessary rpc serialization data structures,
 //! which includes `tt` related data and some task messages.
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml
index 0954ffb66..7171f0808 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc_macro_srv/Cargo.toml
@@ -15,7 +15,7 @@ memmap = "0.7"
 
 tt = { path = "../tt" }
 mbe = { path = "../mbe" }
-ra_proc_macro = { path = "../ra_proc_macro" }
+proc_macro_api = { path = "../proc_macro_api" }
 test_utils = { path = "../test_utils" }
 
 [dev-dependencies]
diff --git a/crates/proc_macro_srv/src/cli.rs b/crates/proc_macro_srv/src/cli.rs
index 1437794c9..d428b9567 100644
--- a/crates/proc_macro_srv/src/cli.rs
+++ b/crates/proc_macro_srv/src/cli.rs
@@ -1,7 +1,7 @@
 //! Driver for proc macro server
 
 use crate::ProcMacroSrv;
-use ra_proc_macro::msg::{self, Message};
+use proc_macro_api::msg::{self, Message};
 use std::io;
 
 pub fn run() -> io::Result<()> {
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs
index 9b6cc91ef..f8f705da8 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc_macro_srv/src/dylib.rs
@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 use goblin::{mach::Mach, Object};
 use libloading::Library;
 use memmap::Mmap;
-use ra_proc_macro::ProcMacroKind;
+use proc_macro_api::ProcMacroKind;
 use std::io;
 
 const NEW_REGISTRAR_SYMBOL: &str = "_rustc_proc_macro_decls_";
diff --git a/crates/proc_macro_srv/src/lib.rs b/crates/proc_macro_srv/src/lib.rs
index 1fc2eef82..7e4e4ad50 100644
--- a/crates/proc_macro_srv/src/lib.rs
+++ b/crates/proc_macro_srv/src/lib.rs
@@ -8,7 +8,7 @@
 //! * We use `tt` for proc-macro `TokenStream` server, it is easier to manipulate and interact with
 //!   RA than `proc-macro2` token stream.
 //! * By **copying** the whole rustc `lib_proc_macro` code, we are able to build this with `stable`
-//!   rustc rather than `unstable`. (Although in gerenal ABI compatibility is still an issue)
+//!   rustc rather than `unstable`. (Although in general ABI compatibility is still an issue)…
 
 #[allow(dead_code)]
 #[doc(hidden)]
@@ -20,7 +20,7 @@ mod rustc_server;
 mod dylib;
 
 use proc_macro::bridge::client::TokenStream;
-use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
+use proc_macro_api::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
 use std::{
     collections::{hash_map::Entry, HashMap},
     fs,
diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc_macro_srv/src/tests/utils.rs
index 1b6a0b6fb..5828512d6 100644
--- a/crates/proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc_macro_srv/src/tests/utils.rs
@@ -2,7 +2,7 @@
 
 use crate::dylib;
 use crate::ProcMacroSrv;
-use ra_proc_macro::ListMacrosTask;
+use proc_macro_api::ListMacrosTask;
 use std::str::FromStr;
 use test_utils::assert_eq_text;
 
diff --git a/crates/project_model/Cargo.toml b/crates/project_model/Cargo.toml
index 8d8d09387..1c84c7d20 100644
--- a/crates/project_model/Cargo.toml
+++ b/crates/project_model/Cargo.toml
@@ -20,6 +20,6 @@ arena = { path = "../arena" }
 cfg = { path = "../cfg" }
 ra_db = { path = "../ra_db" }
 toolchain = { path = "../toolchain" }
-ra_proc_macro =  { path = "../ra_proc_macro" }
+proc_macro_api =  { path = "../proc_macro_api" }
 paths =  { path = "../paths" }
 stdx =  { path = "../stdx" }
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index ee42198f3..234f908c9 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -25,7 +25,7 @@ pub use crate::{
     sysroot::Sysroot,
 };
 
-pub use ra_proc_macro::ProcMacroClient;
+pub use proc_macro_api::ProcMacroClient;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub enum ProjectWorkspace {
diff --git a/crates/ra_ide/src/inlay_hints.rs b/crates/ra_ide/src/inlay_hints.rs
index 46ddc528e..81fe274ad 100644
--- a/crates/ra_ide/src/inlay_hints.rs
+++ b/crates/ra_ide/src/inlay_hints.rs
@@ -156,15 +156,15 @@ fn get_param_name_hints(
         .params(sema.db)
         .into_iter()
         .zip(args)
-        .filter_map(|((param, _ty), arg)| match param? {
-            Either::Left(self_param) => Some((self_param.to_string(), arg)),
-            Either::Right(pat) => {
-                let param_name = match pat {
+        .filter_map(|((param, _ty), arg)| {
+            let param_name = match param? {
+                Either::Left(self_param) => self_param.to_string(),
+                Either::Right(pat) => match pat {
                     ast::Pat::IdentPat(it) => it.name()?.to_string(),
-                    it => it.to_string(),
-                };
-                Some((param_name, arg))
-            }
+                    _ => return None,
+                },
+            };
+            Some((param_name, arg))
         })
         .filter(|(param_name, arg)| should_show_param_name_hint(sema, &callable, &param_name, &arg))
         .map(|(param_name, arg)| InlayHint {
@@ -707,6 +707,8 @@ fn different_order(param: &Param) {}
 fn different_order_mut(param: &mut Param) {}
 fn has_underscore(_param: bool) {}
 fn enum_matches_param_name(completion_kind: CompletionKind) {}
+fn param_destructuring_omitted_1((a, b): (u32, u32)) {}
+fn param_destructuring_omitted_2(TestVarContainer { test_var: _ }: TestVarContainer) {}
 
 fn twiddle(twiddle: bool) {}
 fn doo(_doo: bool) {}
@@ -746,6 +748,10 @@ fn main() {
     let b: f64 = 4.0;
     let _: f64 = a.div_euclid(b);
     let _: f64 = a.abs_sub(b);
+
+    let range: (u32, u32) = (3, 5);
+    param_destructuring_omitted_1(range);
+    param_destructuring_omitted_2(container);
 }"#,
         );
     }