Remove redundant scopes
This commit is contained in:
parent
e3a4a03657
commit
a2d9b6d1b1
@ -156,20 +156,18 @@ fn normalize_ranges(ranges: &mut HashMap<FileName, Vec<Range>>) {
|
||||
for ranges in ranges.values_mut() {
|
||||
ranges.sort();
|
||||
let mut result = vec![];
|
||||
{
|
||||
let mut iter = ranges.iter_mut().peekable();
|
||||
while let Some(next) = iter.next() {
|
||||
let mut next = *next;
|
||||
while let Some(&&mut peek) = iter.peek() {
|
||||
if let Some(merged) = next.merge(peek) {
|
||||
iter.next().unwrap();
|
||||
next = merged;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
let mut iter = ranges.iter_mut().peekable();
|
||||
while let Some(next) = iter.next() {
|
||||
let mut next = *next;
|
||||
while let Some(&&mut peek) = iter.peek() {
|
||||
if let Some(merged) = next.merge(peek) {
|
||||
iter.next().unwrap();
|
||||
next = merged;
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
result.push(next)
|
||||
}
|
||||
result.push(next)
|
||||
}
|
||||
*ranges = result;
|
||||
}
|
||||
|
@ -257,16 +257,14 @@ impl Config {
|
||||
let parsed: ::toml::Value = toml
|
||||
.parse()
|
||||
.map_err(|e| format!("Could not parse TOML: {}", e))?;
|
||||
let mut err: String = String::new();
|
||||
{
|
||||
let table = parsed
|
||||
.as_table()
|
||||
.ok_or(String::from("Parsed config was not table"))?;
|
||||
for key in table.keys() {
|
||||
if !Config::is_valid_name(key) {
|
||||
let msg = &format!("Warning: Unknown configuration option `{}`\n", key);
|
||||
err.push_str(msg)
|
||||
}
|
||||
let mut err = String::new();
|
||||
let table = parsed
|
||||
.as_table()
|
||||
.ok_or(String::from("Parsed config was not table"))?;
|
||||
for key in table.keys() {
|
||||
if !Config::is_valid_name(key) {
|
||||
let msg = &format!("Warning: Unknown configuration option `{}`\n", key);
|
||||
err.push_str(msg)
|
||||
}
|
||||
}
|
||||
match parsed.try_into() {
|
||||
|
@ -48,11 +48,7 @@ impl<'b, T: Write + 'b> Session<'b, T> {
|
||||
let format_result = format_project(input, config, self);
|
||||
|
||||
format_result.map(|report| {
|
||||
{
|
||||
let new_errors = &report.internal.borrow().1;
|
||||
|
||||
self.errors.add(new_errors);
|
||||
}
|
||||
self.errors.add(&report.internal.borrow().1);
|
||||
report
|
||||
})
|
||||
})
|
||||
|
Loading…
x
Reference in New Issue
Block a user