Skip to content

Commit cc0b48d

Browse files
committed
Remove or replace all String::to_string calls
Fix all Clippy’s string_to_string warnings.
1 parent 8acc98e commit cc0b48d

File tree

9 files changed

+11
-12
lines changed

9 files changed

+11
-12
lines changed

src/cargo/core/package_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl PackageId {
151151
pub fn with_precise(&self, precise: Option<String>) -> PackageId {
152152
PackageId {
153153
inner: Arc::new(PackageIdInner {
154-
name: self.inner.name.to_string(),
154+
name: self.inner.name.clone(),
155155
version: self.inner.version.clone(),
156156
source_id: self.inner.source_id.with_precise(precise),
157157
}),

src/cargo/core/package_id_spec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ impl PackageIdSpec {
9292
} else {
9393
let version = try!(name_or_version.to_semver()
9494
.map_err(human));
95-
(path_name.to_string(), Some(version))
95+
(path_name.clone(), Some(version))
9696
}
9797
}
9898
}
9999
}
100-
None => (path_name.to_string(), None),
100+
None => (path_name.clone(), None),
101101
}
102102
};
103103
Ok(PackageIdSpec {

src/cargo/ops/cargo_compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub fn compile_pkg<'a>(root_package: &Package,
169169
spec.iter().filter_map(|p| {
170170
match resolve_with_overrides.query(&p) {
171171
Ok(p) => Some(p),
172-
Err(..) => { invalid_spec.push(p.to_string()); None }
172+
Err(..) => { invalid_spec.push(p.clone()); None }
173173
}
174174
}).collect::<Vec<_>>()
175175
} else {

src/cargo/ops/cargo_doc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ pub fn doc(manifest_path: &Path,
4242
bail!("Passing multiple packages and `open` is not supported")
4343
} else if options.compile_opts.spec.len() == 1 {
4444
try!(PackageIdSpec::parse(&options.compile_opts.spec[0]))
45-
.name().replace("-", "_").to_string()
45+
.name().replace("-", "_")
4646
} else {
4747
match lib_names.iter().chain(bin_names.iter()).nth(0) {
48-
Some(s) => s.to_string(),
48+
Some(s) => s.clone(),
4949
None => return Ok(())
5050
}
5151
};

src/cargo/ops/cargo_install.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub fn uninstall(root: Option<&str>,
300300

301301
let bins = bins.iter().map(|s| {
302302
if s.ends_with(env::consts::EXE_SUFFIX) {
303-
s.to_string()
303+
s.clone()
304304
} else {
305305
format!("{}{}", s, env::consts::EXE_SUFFIX)
306306
}

src/cargo/ops/cargo_new.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ fn discover_author() -> CargoResult<(String, Option<String>)> {
175175
let git_config = GitConfig::open_default().ok();
176176
let git_config = git_config.as_ref();
177177
let name = git_config.and_then(|g| g.get_string("user.name").ok())
178-
.map(|s| s.to_string())
179178
.or_else(|| env::var("USER").ok()) // unix
180179
.or_else(|| env::var("USERNAME").ok()); // windows
181180
let name = match name {

src/cargo/ops/cargo_rustc/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
134134
lines.next().unwrap().trim()
135135
.split('_').skip(1).next().unwrap().to_string()
136136
};
137-
Ok((dylib, exe_suffix.to_string()))
137+
Ok((dylib, exe_suffix))
138138
}
139139

140140
/// Prepare this context, ensuring that all filesystem directories are in
@@ -244,7 +244,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
244244
None if unit.target.allows_underscores() => {
245245
unit.target.name().to_string()
246246
}
247-
None => unit.target.crate_name().to_string(),
247+
None => unit.target.crate_name(),
248248
}
249249
}
250250

src/cargo/ops/registry.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ pub fn search(query: &str, config: &Config, index: Option<String>) -> CargoResul
366366
Some(desc) => {
367367
let space = repeat(' ').take(description_margin - name.len())
368368
.collect::<String>();
369-
name.to_string() + &space + &desc
369+
name + &space + &desc
370370
}
371371
None => name
372372
};

src/cargo/sources/git/source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ impl<'cfg> GitSource<'cfg> {
4343
let reference_path = match *reference {
4444
GitReference::Branch(ref s) |
4545
GitReference::Tag(ref s) |
46-
GitReference::Rev(ref s) => s.to_string(),
46+
GitReference::Rev(ref s) => s.clone(),
4747
};
4848
let checkout_path = config.git_checkout_path()
4949
.join(&ident)

0 commit comments

Comments
 (0)