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

Clarify code

Browse Source 
Take advantage of the fact that very large regexes are unlikely
This commit is contained in:
Devon Hollowood 2018-10-09 23:35:10 -07:00
parent 2b9abc5daa
commit 289c642d1a
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clippy_lints/src/regex.rs
View File

@ -18,7 +18,7 @@
use crate::syntax::source_map::{BytePos, Span};
use crate::utils::{is_expn_of, match_def_path, match_type, opt_def_id, paths, span_help_and_lint, span_lint};
use crate::consts::{constant, Constant};
use std::convert::TryInto;
use std::convert::TryFrom;
/// **What it does:** Checks [regex](https://crates.io/crates/regex) creation
/// (with `Regex::new`,`RegexBuilder::new` or `RegexSet::new`) for correct
@ -142,24 +142,11 @@ fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr) {
}
}
#[allow(clippy::cast_possible_truncation)] // truncation very unlikely here
fn str_span(base: Span, c: regex_syntax::ast::Span, offset: u16) -> Span {
let offset = u32::from(offset);
let end = base.lo() + BytePos(
c.end
.offset
.try_into()
.ok()
.and_then(|o: u32| o.checked_add(offset))
.expect("offset too large"),
);
let start = base.lo() + BytePos(
c.start
.offset
.try_into()
.ok()
.and_then(|o: u32| o.checked_add(offset))
.expect("offset too large"),
);
let end = base.lo() + BytePos(u32::try_from(c.end.offset).expect("offset too large") + offset);
let start = base.lo() + BytePos(u32::try_from(c.start.offset).expect("offset too large") + offset);
assert!(start <= end);
Span::new(start, end, base.ctxt())
}