Cleanup project.json deserialization

2020-06-24 15:52:07 +02:00
parent a07cad16ab
commit e6c61d5072
15 changed files with 141 additions and 144 deletions
--- a/crates/rust-analyzer/src/to_proto.rs
+++ b/crates/rust-analyzer/src/to_proto.rs
@@ -663,7 +663,7 @@ pub(crate) fn runnable(
        location: Some(location),
        kind: lsp_ext::RunnableKind::Cargo,
        args: lsp_ext::CargoRunnable {
-            workspace_root: workspace_root,
+            workspace_root: workspace_root.map(|it| it.into()),
            cargo_args,
            executable_args,
        },