Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-09-20 14:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

test-utils: Fix warnings about clippy str_to_string rule

Browse source
This commit is contained in:
Tetsuharu Ohzeki 2024-02-10 00:58:06 +09:00
parent 0a879f7da4
commit c3699b9f32
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/test-utils/src/bench_fixture.rs
View file

@ -12,7 +12,7 @@ pub fn big_struct() -> String {
} }
pub fn big_struct_n(n: u32) -> String { pub fn big_struct_n(n: u32) -> String {
let mut buf = "pub struct RegisterBlock {".to_string(); let mut buf = "pub struct RegisterBlock {".to_owned();
for i in 0..n { for i in 0..n {
format_to!(buf, " /// Doc comment for {}.\n", i); format_to!(buf, " /// Doc comment for {}.\n", i);
format_to!(buf, " pub s{}: S{},\n", i, i); format_to!(buf, " pub s{}: S{},\n", i, i);

34
crates/test-utils/src/fixture.rs
View file

@ -178,13 +178,13 @@ impl FixtureWithProjectMeta {
if let Some(meta) = fixture.strip_prefix("//- toolchain:") { if let Some(meta) = fixture.strip_prefix("//- toolchain:") {
let (meta, remain) = meta.split_once('\n').unwrap(); let (meta, remain) = meta.split_once('\n').unwrap();
toolchain = Some(meta.trim().to_string()); toolchain = Some(meta.trim().to_owned());
fixture = remain; fixture = remain;
} }
if let Some(meta) = fixture.strip_prefix("//- proc_macros:") { if let Some(meta) = fixture.strip_prefix("//- proc_macros:") {
let (meta, remain) = meta.split_once('\n').unwrap(); let (meta, remain) = meta.split_once('\n').unwrap();
proc_macro_names = meta.split(',').map(|it| it.trim().to_string()).collect(); proc_macro_names = meta.split(',').map(|it| it.trim().to_owned()).collect();
fixture = remain; fixture = remain;
} }
@ -234,7 +234,7 @@ impl FixtureWithProjectMeta {
let meta = meta["//-".len()..].trim(); let meta = meta["//-".len()..].trim();
let mut components = meta.split_ascii_whitespace(); let mut components = meta.split_ascii_whitespace();
let path = components.next().expect("fixture meta must start with a path").to_string(); let path = components.next().expect("fixture meta must start with a path").to_owned();
assert!(path.starts_with('/'), "fixture path does not start with `/`: {path:?}"); assert!(path.starts_with('/'), "fixture path does not start with `/`: {path:?}");
let mut krate = None; let mut krate = None;
@ -246,7 +246,7 @@ impl FixtureWithProjectMeta {
let mut introduce_new_source_root = None; let mut introduce_new_source_root = None;
let mut library = false; let mut library = false;
let mut target_data_layout = Some( let mut target_data_layout = Some(
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128".to_string(), "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128".to_owned(),
); );
for component in components { for component in components {
if component == "library" { if component == "library" {
@ -257,22 +257,22 @@ impl FixtureWithProjectMeta {
let (key, value) = let (key, value) =
component.split_once(':').unwrap_or_else(|| panic!("invalid meta line: {meta:?}")); component.split_once(':').unwrap_or_else(|| panic!("invalid meta line: {meta:?}"));
match key { match key {
"crate" => krate = Some(value.to_string()), "crate" => krate = Some(value.to_owned()),
"deps" => deps = value.split(',').map(|it| it.to_string()).collect(), "deps" => deps = value.split(',').map(|it| it.to_owned()).collect(),
"extern-prelude" => { "extern-prelude" => {
if value.is_empty() { if value.is_empty() {
extern_prelude = Some(Vec::new()); extern_prelude = Some(Vec::new());
} else { } else {
extern_prelude = extern_prelude =
Some(value.split(',').map(|it| it.to_string()).collect::<Vec<_>>()); Some(value.split(',').map(|it| it.to_owned()).collect::<Vec<_>>());
} }
} }
"edition" => edition = Some(value.to_string()), "edition" => edition = Some(value.to_owned()),
"cfg" => { "cfg" => {
for entry in value.split(',') { for entry in value.split(',') {
match entry.split_once('=') { match entry.split_once('=') {
Some((k, v)) => cfgs.push((k.to_string(), Some(v.to_string()))), Some((k, v)) => cfgs.push((k.to_owned(), Some(v.to_owned()))),
None => cfgs.push((entry.to_string(), None)), None => cfgs.push((entry.to_owned(), None)),
} }
} }
} }
@ -283,8 +283,8 @@ impl FixtureWithProjectMeta {
} }
} }
} }
"new_source_root" => introduce_new_source_root = Some(value.to_string()), "new_source_root" => introduce_new_source_root = Some(value.to_owned()),
"target_data_layout" => target_data_layout = Some(value.to_string()), "target_data_layout" => target_data_layout = Some(value.to_owned()),
_ => panic!("bad component: {component:?}"), _ => panic!("bad component: {component:?}"),
} }
} }
@ -381,7 +381,7 @@ impl MiniCore {
let (flag, deps) = line.split_once(':').unwrap(); let (flag, deps) = line.split_once(':').unwrap();
let flag = flag.trim(); let flag = flag.trim();
self.valid_flags.push(flag.to_string()); self.valid_flags.push(flag.to_owned());
implications.extend( implications.extend(
iter::repeat(flag) iter::repeat(flag)
.zip(deps.split(", ").map(str::trim).filter(|dep| !dep.is_empty())), .zip(deps.split(", ").map(str::trim).filter(|dep| !dep.is_empty())),
@ -401,7 +401,7 @@ impl MiniCore {
let mut changed = false; let mut changed = false;
for &(u, v) in &implications { for &(u, v) in &implications {
if self.has_flag(u) && !self.has_flag(v) { if self.has_flag(u) && !self.has_flag(v) {
self.activated_flags.push(v.to_string()); self.activated_flags.push(v.to_owned());
changed = true; changed = true;
} }
} }
@ -486,9 +486,9 @@ fn parse_fixture_gets_full_meta() {
mod m; mod m;
"#, "#,
); );
assert_eq!(toolchain, Some("nightly".to_string())); assert_eq!(toolchain, Some("nightly".to_owned()));
assert_eq!(proc_macro_names, vec!["identity".to_string()]); assert_eq!(proc_macro_names, vec!["identity".to_owned()]);
assert_eq!(mini_core.unwrap().activated_flags, vec!["coerce_unsized".to_string()]); assert_eq!(mini_core.unwrap().activated_flags, vec!["coerce_unsized".to_owned()]);
assert_eq!(1, parsed.len()); assert_eq!(1, parsed.len());
let meta = &parsed[0]; let meta = &parsed[0];

4
crates/test-utils/src/lib.rs
View file

@ -164,7 +164,7 @@ pub fn extract_tags(mut text: &str, tag: &str) -> (Vec<(TextRange, Option<String
if text.starts_with(&open) { if text.starts_with(&open) {
let close_open = text.find('>').unwrap(); let close_open = text.find('>').unwrap();
let attr = text[open.len()..close_open].trim(); let attr = text[open.len()..close_open].trim();
let attr = if attr.is_empty() { None } else { Some(attr.to_string()) }; let attr = if attr.is_empty() { None } else { Some(attr.to_owned()) };
text = &text[close_open + '>'.len_utf8()..]; text = &text[close_open + '>'.len_utf8()..];
let from = TextSize::of(&res); let from = TextSize::of(&res);
stack.push((from, attr)); stack.push((from, attr));
@ -326,7 +326,7 @@ fn extract_line_annotations(mut line: &str) -> Vec<LineAnnotation> {
content = &content["file".len()..]; content = &content["file".len()..];
} }
let content = content.trim_start().to_string(); let content = content.trim_start().to_owned();
let annotation = if continuation { let annotation = if continuation {
LineAnnotation::Continuation { offset: range.end(), content } LineAnnotation::Continuation { offset: range.end(), content }