nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 11:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix width computation in rewrite_binary_op

Browse Source 
Operator width was counted twice.
This commit is contained in:
Gaëtan Cassiers 2015-07-25 18:58:16 +02:00
parent 8461e8a0a8
commit ff301efa4e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/expr.rs
View File

@ -608,7 +608,7 @@ fn rewrite_binary_op(context: &RewriteContext,
result.push_str(&operator_str); result.push_str(&operator_str);
// 1 = space between operator and rhs // 1 = space between operator and rhs
let used_width = result.len() + operator_str.len() + 1; let used_width = result.len() + 1;
let remaining_width = match result.rfind('\n') { let remaining_width = match result.rfind('\n') {
Some(idx) => (offset + width + idx).checked_sub(used_width).unwrap_or(0), Some(idx) => (offset + width + idx).checked_sub(used_width).unwrap_or(0),
None => width.checked_sub(used_width).unwrap_or(0) None => width.checked_sub(used_width).unwrap_or(0)

1
tests/source/expr.rs
View File

@ -7,6 +7,7 @@ fn foo() -> bool {
let very_long_variable_name = ( a + first + simple + test ); let very_long_variable_name = ( a + first + simple + test );
let very_long_variable_name = (a + first + simple + test + AAAAAAAAAAAAA + BBBBBBBBBBBBBBBBB + b + c); let very_long_variable_name = (a + first + simple + test + AAAAAAAAAAAAA + BBBBBBBBBBBBBBBBB + b + c);
//FIXME this exceeds width limit. Needs assignments reformatting
let is_internalxxxx = self.codemap.span_to_filename(s) == self.codemap.span_to_filename(m.inner); let is_internalxxxx = self.codemap.span_to_filename(s) == self.codemap.span_to_filename(m.inner);
let some_val = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * bbbb / (bbbbbb - let some_val = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * bbbb / (bbbbbb -

4
tests/target/expr.rs
View File

@ -8,8 +8,8 @@ fn foo() -> bool {
let very_long_variable_name = (a + first + simple + test + AAAAAAAAAAAAA + BBBBBBBBBBBBBBBBB + let very_long_variable_name = (a + first + simple + test + AAAAAAAAAAAAA + BBBBBBBBBBBBBBBBB +
b + c); b + c);
let is_internalxxxx = self.codemap.span_to_filename(s) == //FIXME this exceeds width limit. Needs assignments reformatting
self.codemap.span_to_filename(m.inner); let is_internalxxxx = self.codemap.span_to_filename(s) == self.codemap.span_to_filename(m.inner);
let some_val = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * bbbb / let some_val = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa * bbbb /
(bbbbbb - function_call(x, *very_long_pointer, y)) + 1000; (bbbbbb - function_call(x, *very_long_pointer, y)) + 1000;