Skip to content

Commit 0f98857

Browse files
committed
---
yaml --- r: 38454 b: refs/heads/try c: 62d1db1 h: refs/heads/master v: v3
1 parent 16a15d6 commit 0f98857

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
@@ -2,7 +2,7 @@
22
refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
5-
refs/heads/try: 07c39b1436f07b3a88daa39a3fc021c4bb3208e5
5+
refs/heads/try: 62d1db1d6c0aaf93323d81b915d8810248c287ec
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/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/try/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)