Skip to content

Commit 97b52c0

Browse files
committed
---
yaml --- r: 192158 b: refs/heads/master c: b92fee9 h: refs/heads/master v: v3
1 parent 6ec0198 commit 97b52c0

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
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a7f00cbc0cde133bca5fd308fa1df43fa691e68c
2+
refs/heads/master: b92fee9a871bbf260201d41b90b40931d995e5c1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a923278c6278c63468d74772c58dbf788e88f58c
55
refs/heads/try: ce76bff75603a754d092456285ff455eb871633d

trunk/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)