Skip to content

Commit bb5b250

Browse files
committed
Auto merge of rust-lang#95501 - Dylan-DPC:rollup-arx6sdc, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - rust-lang#93901 (Stabilize native library modifier syntax and the `whole-archive` modifier specifically) - rust-lang#94806 (Fix `cargo run tidy`) - rust-lang#94869 (Add the generic_associated_types_extended feature) - rust-lang#95011 (async: Give predictable name to binding generated from .await expressions.) - rust-lang#95251 (Reduce max hash in raw strings from u16 to u8) - rust-lang#95298 (Fix double drop of allocator in IntoIter impl of Vec) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 71c1e87 + 7af3565 commit bb5b250

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

clippy_lints/src/regex.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl<'tcx> LateLintPass<'tcx> for Regex {
8181

8282
#[allow(clippy::cast_possible_truncation)] // truncation very unlikely here
8383
#[must_use]
84-
fn str_span(base: Span, c: regex_syntax::ast::Span, offset: u16) -> Span {
84+
fn str_span(base: Span, c: regex_syntax::ast::Span, offset: u8) -> Span {
8585
let offset = u32::from(offset);
8686
let end = base.lo() + BytePos(u32::try_from(c.end.offset).expect("offset too large") + offset);
8787
let start = base.lo() + BytePos(u32::try_from(c.start.offset).expect("offset too large") + offset);

0 commit comments

Comments
 (0)