Skip to content

Commit ede1f7d

Browse files
matthiaskrgrmatthiaskrgr
committed
use String::new() instead of String::from(""), "".to_string(), "".to_owned() or "".into()
1 parent e73077e commit ede1f7d

File tree

87 files changed

+133
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+133
-133
lines changed

‎src/librustc/infer/error_reporting/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
13301330
s
13311331
};
13321332
let var_description = match var_origin {
1333-
infer::MiscVariable(_) => "".to_string(),
1333+
infer::MiscVariable(_) => String::new(),
13341334
infer::PatternRegion(_) => " for pattern".to_string(),
13351335
infer::AddrOfRegion(_) => " for borrow expression".to_string(),
13361336
infer::Autoref(_) => " for autoref".to_string(),

‎src/librustc/mir/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@ impl<'tcx> Debug for Rvalue<'tcx> {
21052105
region
21062106
} else {
21072107
// Do not even print 'static
2108-
"".to_owned()
2108+
String::new()
21092109
};
21102110
write!(fmt, "&{}{}{:?}", region, kind_str, place)
21112111
}

‎src/librustc/session/config.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
10511051
"perform LLVM link-time optimizations"),
10521052
target_cpu: Option<String> = (None, parse_opt_string, [TRACKED],
10531053
"select target processor (rustc --print target-cpus for details)"),
1054-
target_feature: String = ("".to_string(), parse_string, [TRACKED],
1054+
target_feature: String = (String::new(), parse_string, [TRACKED],
10551055
"target specific attributes (rustc --print target-features for details)"),
10561056
passes: Vec<String> = (Vec::new(), parse_list, [TRACKED],
10571057
"a list of extra LLVM passes to run (space separated)"),
@@ -1085,7 +1085,7 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
10851085
"choose the code model to use (rustc --print code-models for details)"),
10861086
metadata: Vec<String> = (Vec::new(), parse_list, [TRACKED],
10871087
"metadata to mangle symbol names with"),
1088-
extra_filename: String = ("".to_string(), parse_string, [UNTRACKED],
1088+
extra_filename: String = (String::new(), parse_string, [UNTRACKED],
10891089
"extra data to put in each output filename"),
10901090
codegen_units: Option<usize> = (None, parse_opt_uint, [UNTRACKED],
10911091
"divide crate into N units to optimize in parallel"),
@@ -1992,7 +1992,7 @@ pub fn build_session_options_and_crate_config(
19921992
};
19931993
if cg.target_feature == "help" {
19941994
prints.push(PrintRequest::TargetFeatures);
1995-
cg.target_feature = "".to_string();
1995+
cg.target_feature = String::new();
19961996
}
19971997
if cg.relocation_model.as_ref().map_or(false, |s| s == "help") {
19981998
prints.push(PrintRequest::RelocationModels);

‎src/librustc/traits/error_reporting.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
472472
if len > 5 {
473473
format!("\nand {} others", len - 4)
474474
} else {
475-
"".to_owned()
475+
String::new()
476476
}
477477
));
478478
}
@@ -917,7 +917,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
917917
remove_refs);
918918

919919
err.span_suggestion_short_with_applicability(
920-
sp, &format_str, String::from(""), Applicability::MachineApplicable
920+
sp, &format_str, String::new(), Applicability::MachineApplicable
921921
);
922922
break;
923923
}
@@ -1116,7 +1116,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
11161116
.collect::<Vec<String>>()
11171117
.join(", "))
11181118
} else {
1119-
"".to_owned()
1119+
String::new()
11201120
},
11211121
);
11221122
err.span_suggestion_with_applicability(

‎src/librustc/traits/select.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,13 @@ impl IntercrateAmbiguityCause {
120120
&IntercrateAmbiguityCause::DownstreamCrate { ref trait_desc, ref self_desc } => {
121121
let self_desc = if let &Some(ref ty) = self_desc {
122122
format!(" for type `{}`", ty)
123-
} else { "".to_string() };
123+
} else { String::new() };
124124
format!("downstream crates may implement trait `{}`{}", trait_desc, self_desc)
125125
}
126126
&IntercrateAmbiguityCause::UpstreamCrateUpdate { ref trait_desc, ref self_desc } => {
127127
let self_desc = if let &Some(ref ty) = self_desc {
128128
format!(" for type `{}`", ty)
129-
} else { "".to_string() };
129+
} else { String::new() };
130130
format!("upstream crates may add new impl of trait `{}`{} \
131131
in future versions",
132132
trait_desc, self_desc)

‎src/librustc/util/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ fn print_time_passes_entry_internal(what: &str, dur: Duration) {
213213
let mb = n as f64 / 1_000_000.0;
214214
format!("; rss: {}MB", mb.round() as usize)
215215
}
216-
None => "".to_owned(),
216+
None => String::new(),
217217
};
218218
println!("{}time: {}{}\t{}",
219219
" ".repeat(indentation),

‎src/librustc/util/profiling.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ macro_rules! define_categories {
7373
(format!("{:.2}",
7474
(((hits as f32) / (total as f32)) * 100.0)), total.to_string())
7575
} else {
76-
("".into(), "".into())
76+
(String::new(), String::new())
7777
};
7878

7979
writeln!(

‎src/librustc_borrowck/borrowck/unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ impl<'a, 'tcx> UnusedMutCx<'a, 'tcx> {
8787
.span_suggestion_short_with_applicability(
8888
mut_span,
8989
"remove this `mut`",
90-
"".to_owned(),
90+
String::new(),
9191
Applicability::MachineApplicable)
9292
.emit();
9393
}

‎src/librustc_borrowck/dataflow.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,21 @@ impl<'a, 'tcx, O:DataFlowOperator> pprust::PpAnn for DataFlowContext<'a, 'tcx, O
140140
let gens_str = if gens.iter().any(|&u| u != 0) {
141141
format!(" gen: {}", bits_to_string(gens))
142142
} else {
143-
"".to_string()
143+
String::new()
144144
};
145145

146146
let action_kills = &self.action_kills[start .. end];
147147
let action_kills_str = if action_kills.iter().any(|&u| u != 0) {
148148
format!(" action_kill: {}", bits_to_string(action_kills))
149149
} else {
150-
"".to_string()
150+
String::new()
151151
};
152152

153153
let scope_kills = &self.scope_kills[start .. end];
154154
let scope_kills_str = if scope_kills.iter().any(|&u| u != 0) {
155155
format!(" scope_kill: {}", bits_to_string(scope_kills))
156156
} else {
157-
"".to_string()
157+
String::new()
158158
};
159159

160160
ps.synth_comment(

‎src/librustc_borrowck/graphviz.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl<'a, 'tcx> DataflowLabeller<'a, 'tcx> {
5353
fn dataflow_for(&self, e: EntryOrExit, n: &Node<'a>) -> String {
5454
let id = n.1.data.id();
5555
debug!("dataflow_for({:?}, id={:?}) {:?}", e, id, self.variants);
56-
let mut sets = "".to_string();
56+
let mut sets = String::new();
5757
let mut seen_one = false;
5858
for &variant in &self.variants {
5959
if seen_one { sets.push_str(" "); } else { seen_one = true; }

‎src/librustc_codegen_llvm/debuginfo/metadata.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
11911191
member_descriptions);
11921192
vec![
11931193
MemberDescription {
1194-
name: "".to_string(),
1194+
name: String::new(),
11951195
type_metadata: variant_type_metadata,
11961196
offset: Size::ZERO,
11971197
size: self.layout.size,
@@ -1220,7 +1220,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
12201220
variant_type_metadata,
12211221
member_descriptions);
12221222
MemberDescription {
1223-
name: "".to_string(),
1223+
name: String::new(),
12241224
type_metadata: variant_type_metadata,
12251225
offset: Size::ZERO,
12261226
size: variant.size,

‎src/librustc_driver/profile/trace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn html_of_effect(eff: &Effect) -> (String, String) {
8585
fn html_of_duration(_start: &Instant, dur: &Duration) -> (String, String) {
8686
use rustc::util::common::duration_to_secs_str;
8787
(duration_to_secs_str(dur.clone()),
88-
"".to_string()
88+
String::new()
8989
)
9090
}
9191

‎src/librustc_errors/emitter.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ impl EmitterWriter {
798798
// at by "in this macro invocation"
799799
format!(" (#{})", i + 1)
800800
} else {
801-
"".to_string()
801+
String::new()
802802
})));
803803
}
804804
// Check to make sure we're not in any <*macros>
@@ -813,7 +813,7 @@ impl EmitterWriter {
813813
// backtrace is multiple levels deep
814814
format!(" (#{})", i + 1)
815815
} else {
816-
"".to_string()
816+
String::new()
817817
})));
818818
if !always_backtrace {
819819
break;
@@ -1065,7 +1065,7 @@ impl EmitterWriter {
10651065
let col = if let Some(first_annotation) = first_line.annotations.first() {
10661066
format!(":{}", first_annotation.start_col + 1)
10671067
} else {
1068-
"".to_string()
1068+
String::new()
10691069
};
10701070
format!("{}:{}{}",
10711071
annotated_file.file.name,

‎src/librustc_lint/builtin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ impl EarlyLintPass for DeprecatedAttr {
794794
err.span_suggestion_short_with_applicability(
795795
attr.span,
796796
"remove this attribute",
797-
"".to_owned(),
797+
String::new(),
798798
Applicability::MachineApplicable
799799
);
800800
err.emit();
@@ -1250,7 +1250,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidNoMangleItems {
12501250
err.span_suggestion_short_with_applicability(
12511251
no_mangle_attr.span,
12521252
"remove this attribute",
1253-
"".to_owned(),
1253+
String::new(),
12541254
// Use of `#[no_mangle]` suggests FFI intent; correct
12551255
// fix may be to monomorphize source by hand
12561256
Applicability::MaybeIncorrect

‎src/librustc_mir/borrow_check/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ fn do_mir_borrowck<'a, 'gcx, 'tcx>(
327327
err.span_suggestion_short_with_applicability(
328328
mut_span,
329329
"remove this `mut`",
330-
"".to_owned(),
330+
String::new(),
331331
Applicability::MachineApplicable);
332332

333333
err.buffer(&mut mbcx.errors_buffer);

‎src/librustc_mir/borrow_check/mutability_errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
128128
}
129129
} else {
130130
item_msg = format!("data in a {}", pointer_type);
131-
reason = "".to_string();
131+
reason = String::new();
132132
}
133133
}
134134
}
@@ -138,7 +138,7 @@ impl<'a, 'gcx, 'tcx> MirBorrowckCtxt<'a, 'gcx, 'tcx> {
138138
Place::Static(box Static { def_id, ty: _ }) => {
139139
if let Place::Static(_) = access_place {
140140
item_msg = format!("immutable static item `{}`", access_place_desc.unwrap());
141-
reason = "".to_string();
141+
reason = String::new();
142142
} else {
143143
item_msg = format!("`{}`", access_place_desc.unwrap());
144144
let static_name = &self.tcx.item_name(*def_id);

‎src/librustc_mir/util/borrowck_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ pub trait BorrowckErrors<'cx>: Sized + Copy {
474474
) -> DiagnosticBuilder<'cx> {
475475
let moved_path = moved_path
476476
.map(|mp| format!(": `{}`", mp))
477-
.unwrap_or("".to_owned());
477+
.unwrap_or(String::new());
478478

479479
let err = struct_span_err!(
480480
self,

‎src/librustc_resolve/resolve_imports.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,7 @@ impl<'a, 'b:'a, 'c: 'b> ImportResolver<'a, 'b, 'c> {
994994
let lev_suggestion =
995995
match find_best_match_for_name(names, &ident.as_str(), None) {
996996
Some(name) => format!(". Did you mean to use `{}`?", name),
997-
None => "".to_owned(),
997+
None => String::new(),
998998
};
999999
let msg = match module {
10001000
ModuleOrUniformRoot::Module(module) => {

‎src/librustc_save_analysis/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ impl<'a> DumpHandler<'a> {
10501050
.iter()
10511051
.any(|ct| *ct == CrateType::Executable);
10521052
let mut out_name = if executable {
1053-
"".to_owned()
1053+
String::new()
10541054
} else {
10551055
"lib".to_owned()
10561056
};

‎src/librustc_target/spec/aarch64_apple_ios.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub fn target() -> TargetResult {
2121
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
2222
arch: "aarch64".to_string(),
2323
target_os: "ios".to_string(),
24-
target_env: "".to_string(),
24+
target_env: String::new(),
2525
target_vendor: "apple".to_string(),
2626
linker_flavor: LinkerFlavor::Gcc,
2727
options: TargetOptions {

‎src/librustc_target/spec/aarch64_fuchsia.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ pub fn target() -> TargetResult {
2222
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2323
arch: "aarch64".to_string(),
2424
target_os: "fuchsia".to_string(),
25-
target_env: "".to_string(),
26-
target_vendor: "".to_string(),
25+
target_env: String::new(),
26+
target_vendor: String::new(),
2727
linker_flavor: LinkerFlavor::Gcc,
2828
options: TargetOptions {
2929
abi_blacklist: super::arm_base::abi_blacklist(),

‎src/librustc_target/spec/aarch64_linux_android.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub fn target() -> TargetResult {
2727
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2828
arch: "aarch64".to_string(),
2929
target_os: "android".to_string(),
30-
target_env: "".to_string(),
30+
target_env: String::new(),
3131
target_vendor: "unknown".to_string(),
3232
linker_flavor: LinkerFlavor::Gcc,
3333
options: TargetOptions {

‎src/librustc_target/spec/aarch64_unknown_cloudabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2525
arch: "aarch64".to_string(),
2626
target_os: "cloudabi".to_string(),
27-
target_env: "".to_string(),
27+
target_env: String::new(),
2828
target_vendor: "unknown".to_string(),
2929
linker_flavor: LinkerFlavor::Gcc,
3030
options: base,

‎src/librustc_target/spec/aarch64_unknown_freebsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn target() -> TargetResult {
2525
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2626
arch: "aarch64".to_string(),
2727
target_os: "freebsd".to_string(),
28-
target_env: "".to_string(),
28+
target_env: String::new(),
2929
target_vendor: "unknown".to_string(),
3030
linker_flavor: LinkerFlavor::Gcc,
3131
options: TargetOptions {

‎src/librustc_target/spec/aarch64_unknown_hermit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2525
arch: "aarch64".to_string(),
2626
target_os: "hermit".to_string(),
27-
target_env: "".to_string(),
27+
target_env: String::new(),
2828
target_vendor: "unknown".to_string(),
2929
linker_flavor: LinkerFlavor::Gcc,
3030
options: base,

‎src/librustc_target/spec/aarch64_unknown_netbsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn target() -> TargetResult {
2323
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2424
arch: "aarch64".to_string(),
2525
target_os: "netbsd".to_string(),
26-
target_env: "".to_string(),
26+
target_env: String::new(),
2727
target_vendor: "unknown".to_string(),
2828
linker_flavor: LinkerFlavor::Gcc,
2929
options: base,

‎src/librustc_target/spec/aarch64_unknown_none.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ pub fn target() -> Result<Target, String> {
3636
target_pointer_width: "64".to_string(),
3737
target_c_int_width: "32".to_string(),
3838
target_os: "none".to_string(),
39-
target_env: "".to_string(),
40-
target_vendor: "".to_string(),
39+
target_env: String::new(),
40+
target_vendor: String::new(),
4141
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
4242
arch: "aarch64".to_string(),
4343
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),

‎src/librustc_target/spec/aarch64_unknown_openbsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub fn target() -> TargetResult {
2323
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
2424
arch: "aarch64".to_string(),
2525
target_os: "openbsd".to_string(),
26-
target_env: "".to_string(),
26+
target_env: String::new(),
2727
target_vendor: "unknown".to_string(),
2828
linker_flavor: LinkerFlavor::Gcc,
2929
options: base,

‎src/librustc_target/spec/arm_linux_androideabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn target() -> TargetResult {
2424
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
2525
arch: "arm".to_string(),
2626
target_os: "android".to_string(),
27-
target_env: "".to_string(),
27+
target_env: String::new(),
2828
target_vendor: "unknown".to_string(),
2929
linker_flavor: LinkerFlavor::Gcc,
3030
options: TargetOptions {

‎src/librustc_target/spec/armebv7r_none_eabihf.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ pub fn target() -> TargetResult {
2222
data_layout: "E-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
2323
arch: "arm".to_string(),
2424
target_os: "none".to_string(),
25-
target_env: "".to_string(),
26-
target_vendor: "".to_string(),
25+
target_env: String::new(),
26+
target_vendor: String::new(),
2727
linker_flavor: LinkerFlavor::Gcc,
2828

2929
options: TargetOptions {

‎src/librustc_target/spec/armv7_apple_ios.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub fn target() -> TargetResult {
2121
data_layout: "e-m:o-p:32:32-f64:32:64-v64:32:64-v128:32:128-a:0:32-n32-S32".to_string(),
2222
arch: "arm".to_string(),
2323
target_os: "ios".to_string(),
24-
target_env: "".to_string(),
24+
target_env: String::new(),
2525
target_vendor: "apple".to_string(),
2626
linker_flavor: LinkerFlavor::Gcc,
2727
options: TargetOptions {

‎src/librustc_target/spec/armv7_linux_androideabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub fn target() -> TargetResult {
2828
data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
2929
arch: "arm".to_string(),
3030
target_os: "android".to_string(),
31-
target_env: "".to_string(),
31+
target_env: String::new(),
3232
target_vendor: "unknown".to_string(),
3333
linker_flavor: LinkerFlavor::Gcc,
3434
options: TargetOptions {

0 commit comments

Comments
 (0)