Rollup merge of #120329 - nnethercote:3349-precursors, r=fee1-dead

matthiaskrgr · web-flow · commit f096e911252f · 2024-01-26T14:43:31.000+01:00
RFC 3349 precursors

Some cleanups I found while working on RFC 3349 that are worth landing separately.

r? `@fee1-dead`
diff --git a/clippy_dev/src/update_lints.rs b/clippy_dev/src/update_lints.rs
@@ -928,7 +928,7 @@ fn remove_line_splices(s: &str) -> String {
         .and_then(|s| s.strip_suffix('"'))
         .unwrap_or_else(|| panic!("expected quoted string, found `{s}`"));
     let mut res = String::with_capacity(s.len());
-    unescape::unescape_literal(s, unescape::Mode::Str, &mut |range, ch| {
+    unescape::unescape_unicode(s, unescape::Mode::Str, &mut |range, ch| {
         if ch.is_ok() {
             res.push_str(&s[range]);
         }

Original file line number	Diff line number	Diff line change
`@@ -928,7 +928,7 @@ fn remove_line_splices(s: &str) -> String {`
`928`	`928`	`.and_then(\|s\| s.strip_suffix('"'))`
`929`	`929`	.unwrap_or_else(\|\| panic!("expected quoted string, found `{s}`"));
`930`	`930`	`let mut res = String::with_capacity(s.len());`
`931`		`- unescape::unescape_literal(s, unescape::Mode::Str, &mut \|range, ch\| {`
	`931`	`+ unescape::unescape_unicode(s, unescape::Mode::Str, &mut \|range, ch\| {`
`932`	`932`	`if ch.is_ok() {`
`933`	`933`	`res.push_str(&s[range]);`
`934`	`934`	`}`