diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 11:12:28 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-30 14:08:40 -0700 |
| commit | acd48a2b3e7fcc0372f7718a2fac1cf80e03db95 (patch) | |
| tree | bf57c82936ee2c1e1df23edd0a750ec6aa75021d /src/libcollections/string.rs | |
| parent | 14192d6df5cc714e5c9a3ca70b08f2514d977be2 (diff) | |
| download | rust-acd48a2b3e7fcc0372f7718a2fac1cf80e03db95.tar.gz rust-acd48a2b3e7fcc0372f7718a2fac1cf80e03db95.zip | |
std: Standardize (input, output) param orderings
This functions swaps the order of arguments to a few functions that previously took (output, input) parameters, but now take (input, output) parameters (in that order). The affected functions are: * ptr::copy * ptr::copy_nonoverlapping * slice::bytes::copy_memory * intrinsics::copy * intrinsics::copy_nonoverlapping Closes #22890 [breaking-change]
Diffstat (limited to 'src/libcollections/string.rs')
| -rw-r--r-- | src/libcollections/string.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 7131c1cd881..923826a1bf0 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -592,8 +592,8 @@ impl String { let ch = self.char_at(idx); let next = idx + ch.len_utf8(); unsafe { - ptr::copy(self.vec.as_mut_ptr().offset(idx as isize), - self.vec.as_ptr().offset(next as isize), + ptr::copy(self.vec.as_ptr().offset(next as isize), + self.vec.as_mut_ptr().offset(idx as isize), len - next); self.vec.set_len(len - (next - idx)); } @@ -622,11 +622,11 @@ impl String { let amt = ch.encode_utf8(&mut bits).unwrap(); unsafe { - ptr::copy(self.vec.as_mut_ptr().offset((idx + amt) as isize), - self.vec.as_ptr().offset(idx as isize), + ptr::copy(self.vec.as_ptr().offset(idx as isize), + self.vec.as_mut_ptr().offset((idx + amt) as isize), len - idx); - ptr::copy(self.vec.as_mut_ptr().offset(idx as isize), - bits.as_ptr(), + ptr::copy(bits.as_ptr(), + self.vec.as_mut_ptr().offset(idx as isize), amt); self.vec.set_len(len + amt); } |
