Skip to content

Commit e07944f

Browse files
committed
---
yaml --- r: 39839 b: refs/heads/incoming c: 62d1db1 h: refs/heads/master i: 39837: 8b330df 39835: 56b72e0 39831: 9eece94 39823: 33e755e 39807: 594ad2b v: v3
1 parent 524c37a commit e07944f

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 07c39b1436f07b3a88daa39a3fc021c4bb3208e5
9+
refs/heads/incoming: 62d1db1d6c0aaf93323d81b915d8810248c287ec
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/ptr.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
134134
* and destination may overlap.
135135
*/
136136
#[inline(always)]
137-
pub unsafe fn copy_overlapping_memory<T>(dst: *mut T, src: *const T, count: uint) {
137+
pub unsafe fn copy_overlapping_memory<T>(dst: *mut T, src: *const T,
138+
count: uint) {
138139
let n = count * sys::size_of::<T>();
139140
libc_::memmove(dst as *mut c_void, src as *c_void, n as size_t);
140141
}

branches/incoming/src/libcore/vec.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,7 +2085,8 @@ pub mod raw {
20852085
* Copies `count` bytes from `src` to `dst`. The source and destination
20862086
* may overlap.
20872087
*/
2088-
pub unsafe fn copy_memory<T>(dst: &[mut T], src: &[const T], count: uint) {
2088+
pub unsafe fn copy_memory<T>(dst: &[mut T], src: &[const T],
2089+
count: uint) {
20892090
assert dst.len() >= count;
20902091
assert src.len() >= count;
20912092

@@ -2102,7 +2103,8 @@ pub mod raw {
21022103
* Copies `count` bytes from `src` to `dst`. The source and destination
21032104
* may overlap.
21042105
*/
2105-
pub unsafe fn copy_overlapping_memory<T>(dst: &[mut T], src: &[const T], count: uint) {
2106+
pub unsafe fn copy_overlapping_memory<T>(dst: &[mut T], src: &[const T],
2107+
count: uint) {
21062108
assert dst.len() >= count;
21072109
assert src.len() >= count;
21082110

@@ -2178,7 +2180,8 @@ pub mod bytes {
21782180
* Copies `count` bytes from `src` to `dst`. The source and destination
21792181
* may overlap.
21802182
*/
2181-
pub fn copy_overlapping_memory(dst: &[mut u8], src: &[const u8], count: uint) {
2183+
pub fn copy_overlapping_memory(dst: &[mut u8], src: &[const u8],
2184+
count: uint) {
21822185
// Bound checks are done at vec::raw::copy_overlapping_memory.
21832186
unsafe { vec::raw::copy_overlapping_memory(dst, src, count) }
21842187
}

0 commit comments

Comments
 (0)