about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-03-31 00:29:54 +0000
committerbors <bors@rust-lang.org>2022-03-31 00:29:54 +0000
commitbb5b250fa15780dd80e025c3e7991609d996badc (patch)
treea40102e9f3e5865b972eb50a40ec54991650216a
parent71c1e873907be8b50a54bce1be01fb5308ccbc0d (diff)
parent7af3565083974c9f4d14e1e016664fec1f3c3de4 (diff)
downloadrust-bb5b250fa15780dd80e025c3e7991609d996badc.tar.gz
rust-bb5b250fa15780dd80e025c3e7991609d996badc.zip
Auto merge of #95501 - Dylan-DPC:rollup-arx6sdc, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #93901 (Stabilize native library modifier syntax and the `whole-archive` modifier specifically)
 - #94806 (Fix `cargo run tidy`)
 - #94869 (Add the generic_associated_types_extended feature)
 - #95011 (async: Give predictable name to binding generated from .await expressions.)
 - #95251 (Reduce max hash in raw strings from u16 to u8)
 - #95298 (Fix double drop of allocator in IntoIter impl of Vec)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
-rw-r--r--clippy_lints/src/regex.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/clippy_lints/src/regex.rs b/clippy_lints/src/regex.rs
index b6d04334de9..a92097e1d24 100644
--- a/clippy_lints/src/regex.rs
+++ b/clippy_lints/src/regex.rs
@@ -81,7 +81,7 @@ impl<'tcx> LateLintPass<'tcx> for Regex {
 
 #[allow(clippy::cast_possible_truncation)] // truncation very unlikely here
 #[must_use]
-fn str_span(base: Span, c: regex_syntax::ast::Span, offset: u16) -> Span {
+fn str_span(base: Span, c: regex_syntax::ast::Span, offset: u8) -> Span {
     let offset = u32::from(offset);
     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);