Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Adjust for upstream changes #1700

Merged
merged 2 commits into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions rls-rustc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 1 addition & 0 deletions rls/src/build/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ fn run_in_process(
&mut callbacks,
Some(Box::new(ReplacedFileLoader::new(changed))),
Some(Box::new(BufWriter(stderr))),
None,
)
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
}