user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1059 from marcusklaas/fix-subtract

Browse source 
Fix integer underflow
This commit is contained in:
Nick Cameron 2016-06-10 16:00:46 +02:00 • committed by GitHub
commit 931e71eb43
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/expr.rs
View file

@ -1278,7 +1278,7 @@ fn rewrite_pat_expr(context: &RewriteContext,
let spacer = if pat.is_some() { " " } else { "" };
let expr_rewrite = expr.rewrite(context,
width - extra_offset - spacer.len(),
try_opt!(width.checked_sub(extra_offset + spacer.len())),
offset + extra_offset + spacer.len());
if let Some(expr_string) = expr_rewrite {
@ -1292,9 +1292,10 @@ fn rewrite_pat_expr(context: &RewriteContext,
result.push('\n');
result.push_str(&pat_offset.to_string(context.config));
let expr_rewrite = expr.rewrite(context,
context.config.max_width - pat_offset.width(),
pat_offset);
let expr_rewrite =
expr.rewrite(context,
try_opt!(context.config.max_width.checked_sub(pat_offset.width())),
pat_offset);
result.push_str(&&try_opt!(expr_rewrite));
Some(result)