Merge #378

author bors[bot] <bors[bot]@users.noreply.github.com>

Sun, 30 Dec 2018 20:33:32 +0000 (20:33 +0000)

committer bors[bot] <bors[bot]@users.noreply.github.com>

Sun, 30 Dec 2018 20:33:32 +0000 (20:33 +0000)
author bors[bot] <bors[bot]@users.noreply.github.com>
Sun, 30 Dec 2018 20:33:32 +0000 (20:33 +0000)
committer bors[bot] <bors[bot]@users.noreply.github.com>
Sun, 30 Dec 2018 20:33:32 +0000 (20:33 +0000)
diff --cc Cargo.lock
Simple merge
diff --cc crates/ra_lsp_server/Cargo.toml
Simple merge
diff --cc crates/ra_lsp_server/tests/heavy_tests/support.rs
Simple merge
author	bors[bot] <bors[bot]@users.noreply.github.com>
	Sun, 30 Dec 2018 20:33:32 +0000 (20:33 +0000)
committer	bors[bot] <bors[bot]@users.noreply.github.com>
	Sun, 30 Dec 2018 20:33:32 +0000 (20:33 +0000)
		1	2
Cargo.lock	patch \|	diff1 \|	diff2 \|	blob \| history
crates/ra_lsp_server/Cargo.toml	patch \|	diff1 \|	diff2 \|	blob \| history
crates/ra_lsp_server/tests/heavy_tests/support.rs	patch \|	diff1 \|	diff2 \|	blob \| history