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

Merge pull request #947 from marcusklaas/match-pattern-limit

Browse Source 
Fix off-by-one error in pattern formatting
This commit is contained in:
Nick Cameron 2016-04-17 10:23:48 +12:00
commit fe993dbdf3
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/patterns.rs
View File

@ -76,8 +76,9 @@ impl Rewrite for Pat {
if pat_vec.is_empty() {
Some(path_str)
} else {
// 1 = (
let width = try_opt!(width.checked_sub(path_str.len() + 1));
// 2 = "()".len()
let width = try_opt!(width.checked_sub(path_str.len() + 2));
// 1 = "(".len()
let offset = offset + path_str.len() + 1;
let items = itemize_list(context.codemap,
pat_vec.iter(),

20
tests/source/issue-913.rs Normal file
View File

@ -0,0 +1,20 @@
mod client {
impl Client {
fn test(self) -> Result<()> {
let next_state = match self.state {
State::V5(v5::State::Command(v5::coand::State::WriteVersion(ref mut response))) => {
let x = reformat . meeee() ;
}
};
let next_state = match self.state {
State::V5(v5::State::Command(v5::comand::State::WriteVersion(ref mut response))) => {
// The pattern cannot be formatted in a way that the match stays
// within the column limit. The rewrite should therefore be
// skipped.
let x = dont . reformat . meeee();
}
};
}
}
}

20
tests/target/issue-913.rs Normal file
View File

@ -0,0 +1,20 @@
mod client {
impl Client {
fn test(self) -> Result<()> {
let next_state = match self.state {
State::V5(v5::State::Command(v5::coand::State::WriteVersion(ref mut response))) => {
let x = reformat.meeee();
}
};
let next_state = match self.state {
State::V5(v5::State::Command(v5::comand::State::WriteVersion(ref mut response))) => {
// The pattern cannot be formatted in a way that the match stays
// within the column limit. The rewrite should therefore be
// skipped.
let x = dont . reformat . meeee();
}
};
}
}
}