language-servers/deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-08-03 18:38:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update rust to 1.38.0 (#3030)

Browse source
This commit is contained in:
Andy Hayden 2019-10-03 06:16:06 -07:00 • committed by Ryan Dahl
parent e6e7977199
commit f7bbd71e21
8 changed files with 23 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
cli/source_maps.rs
View file

@ -110,8 +110,8 @@ pub fn apply_source_map<G: SourceMapGetter>(
// source file map.
let end_column = match v8_exception.end_column {
Some(ec) => {
if start_column.is_some() {
Some(ec - (v8_exception.start_column.unwrap() - start_column.unwrap()))
if let Some(sc) = start_column {
Some(ec - (v8_exception.start_column.unwrap() - sc))
} else {
None
}
@ -120,16 +120,17 @@ pub fn apply_source_map<G: SourceMapGetter>(
};
// if there is a source line that we might be different in the source file, we
// will go fetch it from the getter
let source_line = if v8_exception.source_line.is_some()
&& script_resource_name.is_some()
&& line_number.is_some()
{
getter.get_source_line(
&v8_exception.script_resource_name.clone().unwrap(),
line_number.unwrap() as usize,
)
} else {
v8_exception.source_line.clone()
let source_line = match line_number {
Some(ln)
if v8_exception.source_line.is_some()
&& script_resource_name.is_some() =>
{
getter.get_source_line(
&v8_exception.script_resource_name.clone().unwrap(),
ln as usize,
)
}
_ => v8_exception.source_line.clone(),
};
V8Exception {