Skip to content

Commit 61bac9c

Browse files
committed
---
yaml --- r: 233639 b: refs/heads/beta c: fd26636 h: refs/heads/master i: 233637: 8f7be28 233635: 7f49d56 233631: f284936 v: v3
1 parent 01fd6ad commit 61bac9c

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: c97acc30c4299699c6f5217504c8e50dd0451165
26+
refs/heads/beta: fd2663648f32bbada62a0542ecb4ec1c15885713
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_data_structures/transitive_relation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ impl<T:Debug+PartialEq> TransitiveRelation<T> {
110110
/// (there are corresponding tests below, btw). In each case,
111111
/// the query is `postdom_upper_bound(a, b)`:
112112
///
113-
/// ```
113+
/// ```text
114114
/// // returns Some(x), which is also LUB
115115
/// a -> a1 -> x
116116
/// ^

branches/beta/src/librustc_trans/trans/base.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -956,11 +956,6 @@ pub fn memcpy_ty<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
956956
t: Ty<'tcx>) {
957957
let _icx = push_ctxt("memcpy_ty");
958958
let ccx = bcx.ccx();
959-
960-
if type_is_zero_size(ccx, t) {
961-
return;
962-
}
963-
964959
if t.is_structural() {
965960
let llty = type_of::type_of(ccx, t);
966961
let llsz = llsize_of(ccx, llty);

0 commit comments

Comments
 (0)