diff options
| author | bors <bors@rust-lang.org> | 2016-05-07 12:36:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-07 12:36:18 -0700 |
| commit | d91f8ab0f58fa123857d96b9e151fc5185f5ff08 (patch) | |
| tree | 4a21bdfb7f514938fb2996d83ac0b97b544464ab /src/test/codegen-units | |
| parent | 936b32a514b73c1d3dfcbd9d17818f9f18bf4883 (diff) | |
| parent | 84e27738effd0c44f0dc480753fc0affa56fd4a4 (diff) | |
| download | rust-d91f8ab0f58fa123857d96b9e151fc5185f5ff08.tar.gz rust-d91f8ab0f58fa123857d96b9e151fc5185f5ff08.zip | |
Auto merge of #33487 - steveklabnik:rollup, r=steveklabnik
Rollup of 20 pull requests - Successful merges: #33256, #33283, #33313, #33314, #33326, #33336, #33382, #33384, #33402, #33409, #33410, #33412, #33428, #33430, #33437, #33438, #33439, #33442, #33456, #33459 - Failed merges:
Diffstat (limited to 'src/test/codegen-units')
| -rw-r--r-- | src/test/codegen-units/item-collection/cross-crate-closures.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/codegen-units/item-collection/cross-crate-closures.rs b/src/test/codegen-units/item-collection/cross-crate-closures.rs index 30f3ef12d07..546bb235a5f 100644 --- a/src/test/codegen-units/item-collection/cross-crate-closures.rs +++ b/src/test/codegen-units/item-collection/cross-crate-closures.rs @@ -27,7 +27,7 @@ fn main() { //~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32> let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32); - // Nothing should be generated for this call, we just link to the instance instance + // Nothing should be generated for this call, we just link to the instance // in the extern crate. let _ = cgu_extern_closures::non_inlined_fn(6, 7); } |