diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-13 07:42:15 +0100 |
| commit | 16bbf4ab7f132e6e5e5318dccdef9a5d71afdd7f (patch) | |
| tree | 4b79fa8c046be56b02427ba843e70cdf3ac05767 /crates/ra_proc_macro_srv/Cargo.toml | |
| parent | eeb8b9e236796da8734ba81a49164864497f7226 (diff) | |
| parent | b56ad148db0c69eb279c225f45d324b4e80e7367 (diff) | |
Merge branch 'master' into keyword_completion
# Conflicts:
# docs/user/generated_features.adoc
Diffstat (limited to 'crates/ra_proc_macro_srv/Cargo.toml')
| -rw-r--r-- | crates/ra_proc_macro_srv/Cargo.toml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_proc_macro_srv/Cargo.toml b/crates/ra_proc_macro_srv/Cargo.toml index bb3003278..582102945 100644 --- a/crates/ra_proc_macro_srv/Cargo.toml +++ b/crates/ra_proc_macro_srv/Cargo.toml | |||
| @@ -22,3 +22,4 @@ cargo_metadata = "0.10.0" | |||
| 22 | difference = "2.0.0" | 22 | difference = "2.0.0" |
| 23 | # used as proc macro test target | 23 | # used as proc macro test target |
| 24 | serde_derive = "1.0.106" | 24 | serde_derive = "1.0.106" |
| 25 | ra_toolchain = { path = "../ra_toolchain" } | ||