Skip to content

Commit 27aa961

Browse files
committed
---
yaml --- r: 192373 b: refs/heads/auto c: b92fee9 h: refs/heads/master i: 192371: de199ae v: v3
1 parent 62c389c commit 27aa961

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: a7f00cbc0cde133bca5fd308fa1df43fa691e68c
13+
refs/heads/auto: b92fee9a871bbf260201d41b90b40931d995e5c1
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_trans/trans/asm.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ pub fn trans_inline_asm<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, ia: &ast::InlineAsm)
7777
fcx.pop_custom_cleanup_scope(temp_scope);
7878

7979
let clobbers = ia.clobbers.iter()
80-
.map(|s| format!("~{{{}}}", &s))
81-
.collect::<Vec<String>>();
80+
.map(|s| format!("~{{{}}}", &s));
8281

8382
// Default per-arch clobbers
8483
// Basically what clang does
@@ -90,8 +89,8 @@ pub fn trans_inline_asm<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, ia: &ast::InlineAsm)
9089
let all_constraints= constraints.iter()
9190
.map(|s| s.to_string())
9291
.chain(ext_constraints.into_iter())
93-
.chain(clobbers.into_iter())
94-
.chain(arch_clobbers.into_iter()
92+
.chain(clobbers)
93+
.chain(arch_clobbers.iter()
9594
.map(|s| s.to_string()))
9695
.collect::<Vec<String>>()
9796
.connect(",");

0 commit comments

Comments
 (0)