diff options
| author | bors <bors@rust-lang.org> | 2015-03-31 05:47:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-31 05:47:35 +0000 |
| commit | b3317d68910900f135f9f38e43a7a699bc736b4a (patch) | |
| tree | fcc7af00740cd4540119a4f4bf345cd077ed269c /src/libstd/sys | |
| parent | 6cf3b0b74aadcc1fe87adbd2c74876a1f6c920b3 (diff) | |
| parent | db76327ef686d81c74e74ac25028681e61badb3c (diff) | |
| download | rust-b3317d68910900f135f9f38e43a7a699bc736b4a.tar.gz rust-b3317d68910900f135f9f38e43a7a699bc736b4a.zip | |
Auto merge of #23884 - Manishearth:rollup, r=Manishearth
- Successful merges: #23558, #23813, #23826, #23836, #23839, #23846, #23852, #23859, #23862, #23865, #23866, #23869, #23874 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/wtf8.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs index 315df411179..8f788988e55 100644 --- a/src/libstd/sys/common/wtf8.rs +++ b/src/libstd/sys/common/wtf8.rs @@ -344,8 +344,8 @@ impl Wtf8Buf { Some((surrogate_pos, _)) => { pos = surrogate_pos + 3; slice::bytes::copy_memory( + UTF8_REPLACEMENT_CHARACTER, &mut self.bytes[surrogate_pos .. pos], - UTF8_REPLACEMENT_CHARACTER ); }, None => return unsafe { String::from_utf8_unchecked(self.bytes) } |