Skip to content

Commit 471dd52

Browse files
committedJul 19, 2020
Fix merge conflict with recent PR
2 parents e88220f + d7f9451 commit 471dd52

File tree

102 files changed

+3039
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+3039
-1289
lines changed
 

‎Cargo.lock‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2821,6 +2821,13 @@ dependencies = [
28212821
"rls-span",
28222822
]
28232823

2824+
[[package]]
2825+
name = "rust-demangler"
2826+
version = "0.0.0"
2827+
dependencies = [
2828+
"rustc-demangle",
2829+
]
2830+
28242831
[[package]]
28252832
name = "rustbook"
28262833
version = "0.1.0"

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ members = [
1717
"src/tools/remote-test-client",
1818
"src/tools/remote-test-server",
1919
"src/tools/rust-installer",
20+
"src/tools/rust-demangler",
2021
"src/tools/cargo",
2122
"src/tools/rustdoc",
2223
"src/tools/rls",

0 commit comments

Comments
 (0)