Run clippy --fix
for unnecessary_map_or
lint
This commit is contained in:
parent
39dc268459
commit
264fa0fc54
39 changed files with 61 additions and 67 deletions
|
@ -3146,7 +3146,7 @@ impl FileWithAnnotatedLines {
|
|||
add_annotation_to_file(&mut output, Lrc::clone(&file), line, ann.as_line());
|
||||
}
|
||||
let line_end = ann.line_end - 1;
|
||||
let end_is_empty = file.get_line(line_end - 1).map_or(false, |s| !filter(&s));
|
||||
let end_is_empty = file.get_line(line_end - 1).is_some_and(|s| !filter(&s));
|
||||
if middle < line_end && !end_is_empty {
|
||||
add_annotation_to_file(&mut output, Lrc::clone(&file), line_end, ann.as_line());
|
||||
}
|
||||
|
|
|
@ -463,7 +463,7 @@ impl DiagnosticSpan {
|
|||
// is an empty string, increase the length to include the newline so we don't
|
||||
// leave an empty line
|
||||
if start.col.0 == 0
|
||||
&& suggestion.map_or(false, |(s, _)| s.is_empty())
|
||||
&& suggestion.is_some_and(|(s, _)| s.is_empty())
|
||||
&& let Ok(after) = je.sm.span_to_next_source(span)
|
||||
&& after.starts_with('\n')
|
||||
{
|
||||
|
|
|
@ -1717,7 +1717,7 @@ impl DiagCtxtInner {
|
|||
let bugs: Vec<_> =
|
||||
std::mem::take(&mut self.delayed_bugs).into_iter().map(|(b, _)| b).collect();
|
||||
|
||||
let backtrace = std::env::var_os("RUST_BACKTRACE").map_or(true, |x| &x != "0");
|
||||
let backtrace = std::env::var_os("RUST_BACKTRACE").is_none_or(|x| &x != "0");
|
||||
let decorate = backtrace || self.ice_file.is_none();
|
||||
let mut out = self
|
||||
.ice_file
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue