mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a typo in calculating overhead for fn args

Browse Source
This commit is contained in:
topecongiro 2017-08-27 14:57:21 +09:00
parent 6554e7c206
commit ef84319e47
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/items.rs
View File

@ -2284,8 +2284,7 @@ fn compute_budgets_for_args(
} }
IndentStyle::Visual => { IndentStyle::Visual => {
let indent = indent + result.len() + 1; let indent = indent + result.len() + 1;
let multi_line_overhead = let multi_line_overhead = indent.width() + if newline_brace { 2 } else { 4 };
indent.width() + result.len() + if newline_brace { 2 } else { 4 };
let budget = let budget =
try_opt!(context.config.max_width().checked_sub(multi_line_overhead)); try_opt!(context.config.max_width().checked_sub(multi_line_overhead));
(indent, budget) (indent, budget)

22
tests/source/configs-fn_args_layout-visual.rs
View File

@ -8,3 +8,25 @@ fn lorem(ipsum: usize) {}
fn lorem(ipsum: usize, dolor: usize, sit: usize, amet: usize, consectetur: usize, adipiscing: usize, elit: usize) { fn lorem(ipsum: usize, dolor: usize, sit: usize, amet: usize, consectetur: usize, adipiscing: usize, elit: usize) {
// body // body
} }
// #1922
extern "C" {
pub fn LAPACKE_csytrs_rook_work(matrix_layout: c_int,
uplo: c_char,
n: lapack_int,
nrhs: lapack_int,
a: *const lapack_complex_float,
lda: lapack_int, ipiv: *const lapack_int,
b: *mut lapack_complex_float,
ldb: lapack_int
)-> lapack_int;
pub fn LAPACKE_csytrs_rook_work(matrix_layout: c_int,
uplo: c_char,
n: lapack_int,
nrhs: lapack_int,
lda: lapack_int, ipiv: *const lapack_int,
b: *mut lapack_complex_float,
ldb: lapack_int
) -> lapack_int;
}

24
tests/target/configs-fn_args_layout-visual.rs
View File

@ -14,3 +14,27 @@ fn lorem(ipsum: usize,
elit: usize) { elit: usize) {
// body // body
} }
// #1922
extern "C" {
pub fn LAPACKE_csytrs_rook_work(matrix_layout: c_int,
uplo: c_char,
n: lapack_int,
nrhs: lapack_int,
a: *const lapack_complex_float,
lda: lapack_int,
ipiv: *const lapack_int,
b: *mut lapack_complex_float,
ldb: lapack_int)
-> lapack_int;
pub fn LAPACKE_csytrs_rook_work(matrix_layout: c_int,
uplo: c_char,
n: lapack_int,
nrhs: lapack_int,
lda: lapack_int,
ipiv: *const lapack_int,
b: *mut lapack_complex_float,
ldb: lapack_int)
-> lapack_int;
}