aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-01-22 20:37:27 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-01-22 20:37:27 +0000
commitcc6898acd108feabab94ec86b7e1cd33b1133eb9 (patch)
treeb8acdd5d9bc4251d0802bb74ba657e6339d31de7
parentb9f65b18b85c6e942979cb7e6026ba157488f193 (diff)
parent7b28a15202fd22c726ed6e8c2d31e30a19d8e623 (diff)
Merge #600
600: :arrow_up: rowan r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock6
-rw-r--r--crates/ra_syntax/Cargo.toml2
-rw-r--r--crates/ra_syntax/src/yellow.rs4
3 files changed, 8 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock
index cb0706087..9a495a69d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -826,7 +826,7 @@ dependencies = [
826 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 826 "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
827 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 827 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
828 "ra_text_edit 0.1.0", 828 "ra_text_edit 0.1.0",
829 "rowan 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 829 "rowan 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
830 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", 830 "smol_str 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
831 "test_utils 0.1.0", 831 "test_utils 0.1.0",
832 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", 832 "text_unit 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1041,7 +1041,7 @@ dependencies = [
1041 1041
1042[[package]] 1042[[package]]
1043name = "rowan" 1043name = "rowan"
1044version = "0.3.1" 1044version = "0.3.2"
1045source = "registry+https://github.com/rust-lang/crates.io-index" 1045source = "registry+https://github.com/rust-lang/crates.io-index"
1046dependencies = [ 1046dependencies = [
1047 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", 1047 "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1685,7 +1685,7 @@ dependencies = [
1685"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c" 1685"checksum relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0e7790c7f1cc73d831d28dc5a7deb316a006e7848e6a7f467cdb10a0a9e0fb1c"
1686"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" 1686"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
1687"checksum ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d9cb28ade964585205aaca1f3d41a6297f72e1ad097b49c4bbde033ef86b38d7" 1687"checksum ron 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d9cb28ade964585205aaca1f3d41a6297f72e1ad097b49c4bbde033ef86b38d7"
1688"checksum rowan 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "660069534501214380ab070b979f4b41e8cf3a5279ae07d0e949675efbd595bd" 1688"checksum rowan 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "acefc6f0bfd48f98b1d4424bf53c6b1c9dd379d69376e862ba3c44d29773602c"
1689"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" 1689"checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619"
1690"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" 1690"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
1691"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 1691"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml
index 05cf41a8d..c50dc6c67 100644
--- a/crates/ra_syntax/Cargo.toml
+++ b/crates/ra_syntax/Cargo.toml
@@ -13,7 +13,7 @@ unicode-xid = "0.1.0"
13itertools = "0.8.0" 13itertools = "0.8.0"
14drop_bomb = "0.1.4" 14drop_bomb = "0.1.4"
15parking_lot = "0.7.0" 15parking_lot = "0.7.0"
16rowan = "0.3.1" 16rowan = "0.3.2"
17 17
18# ideally, `serde` should be enabled by `ra_lsp_serder`, but we enable it here 18# ideally, `serde` should be enabled by `ra_lsp_serder`, but we enable it here
19# to reduce number of compilations 19# to reduce number of compilations
diff --git a/crates/ra_syntax/src/yellow.rs b/crates/ra_syntax/src/yellow.rs
index 9b93945cc..a7bfb80e2 100644
--- a/crates/ra_syntax/src/yellow.rs
+++ b/crates/ra_syntax/src/yellow.rs
@@ -177,6 +177,10 @@ impl SyntaxNode {
177 pub fn children(&self) -> SyntaxNodeChildren { 177 pub fn children(&self) -> SyntaxNodeChildren {
178 SyntaxNodeChildren(self.0.children()) 178 SyntaxNodeChildren(self.0.children())
179 } 179 }
180
181 pub fn memory_size_of_subtree(&self) -> usize {
182 self.0.memory_size_of_subtree()
183 }
180} 184}
181 185
182impl fmt::Debug for SyntaxNode { 186impl fmt::Debug for SyntaxNode {