Skip to content

Commit 8d2b106

Browse files
committed
---
yaml --- r: 92364 b: refs/heads/auto c: 8a5a592 h: refs/heads/master v: v3
1 parent b4e5b03 commit 8d2b106

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 5c147cc40847da033674663cedabaf515eda8b20
16+
refs/heads/auto: 8a5a5922c61cecd5f305a0cd54671dbf2f2a6519
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/vec.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,7 +2060,7 @@ pub trait MutableVector<'a, T> {
20602060
*/
20612061
unsafe fn init_elem(self, i: uint, val: T);
20622062

2063-
/// Copies data from `src` to `self`
2063+
/// Copies data from `src` to `self`.
20642064
///
20652065
/// `self` and `src` must not overlap. Fails if `self` is
20662066
/// shorter than `src`.
@@ -2208,7 +2208,7 @@ impl<'a,T> MutableVector<'a, T> for &'a mut [T] {
22082208
self.as_mut_buf(|p_dst, len_dst| {
22092209
src.as_imm_buf(|p_src, len_src| {
22102210
assert!(len_dst >= len_src)
2211-
ptr::copy_memory(p_dst, p_src, len_src)
2211+
ptr::copy_nonoverlapping_memory(p_dst, p_src, len_src)
22122212
})
22132213
})
22142214
}
@@ -2350,10 +2350,10 @@ pub mod bytes {
23502350
}
23512351
}
23522352

2353-
/// Copies data from one vector to another.
2353+
/// Copies data from `src` to `dst`
23542354
///
2355-
/// Copies `src` to `dst`. Fails if the length of `dst` is less
2356-
/// than the length of `src`.
2355+
/// `src` and `dst` must not overlap. Fails if the length of `dst`
2356+
/// is less than the length of `src`.
23572357
#[inline]
23582358
pub fn copy_memory(dst: &mut [u8], src: &[u8]) {
23592359
// Bound checks are done at .copy_memory.

0 commit comments

Comments
 (0)