From d4e2bd7afd65a20d443bb2ea7de4de365bc01aa3 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 1 Oct 2020 10:12:45 -0400 Subject: [PATCH 1/2] Adjust for upstream changes --- rls-rustc/src/lib.rs | 8 +++++--- rls/src/build/rustc.rs | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs index 922677c65a1..988c83b377c 100644 --- a/rls-rustc/src/lib.rs +++ b/rls-rustc/src/lib.rs @@ -75,9 +75,11 @@ pub fn run() -> Result<(), ()> { }; rustc_driver::install_ice_hook(); - rustc_driver::catch_fatal_errors(|| run_compiler(&args, &mut shim_calls, file_loader, None)) - .map(|_| ()) - .map_err(|_| ()) + rustc_driver::catch_fatal_errors(|| { + run_compiler(&args, &mut shim_calls, file_loader, None, None) + }) + .map(|_| ()) + .map_err(|_| ()) } #[derive(Default)] diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs index 272710f77bb..947869aabb3 100644 --- a/rls/src/build/rustc.rs +++ b/rls/src/build/rustc.rs @@ -191,6 +191,7 @@ fn run_in_process( &mut callbacks, Some(Box::new(ReplacedFileLoader::new(changed))), Some(Box::new(BufWriter(stderr))), + None, ) }) } From 6dba419848e44120b3062eb9653bef5eeb96d8b9 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 1 Oct 2020 10:42:00 -0400 Subject: [PATCH 2/2] Update tooltip data for upstream changes --- .../test_tooltip_mod_use_external.rs.0004_012.json | 7 +------ .../test_tooltip_mod_use_external.rs.0005_012.json | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json b/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json index 653e5fabf51..2155bbfa9f7 100644 --- a/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json +++ b/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json @@ -5,11 +5,6 @@ "col": 12 }, "data": { - "Ok": [{ - "language": "rust", - "value": "std/src/sync/mod.rs" - }, - "Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code.\n\nConsider the following code, operating on some global static variables:\n\n```rust\nstatic mut A: u32 = 0;" - ] + "Ok": [] } } diff --git a/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json b/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json index 6d5971bd94e..c297747e7c1 100644 --- a/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json +++ b/tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json @@ -5,11 +5,6 @@ "col": 12 }, "data": { - "Ok": [{ - "language": "rust", - "value": "std/src/sync/mod.rs" - }, - "Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code.\n\nConsider the following code, operating on some global static variables:\n\n```rust\nstatic mut A: u32 = 0;" - ] + "Ok": [] } }