diff options
| author | bors <bors@rust-lang.org> | 2016-06-08 19:30:33 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-06-08 19:30:33 -0700 |
| commit | bb4b3fb7f97924919f072ec9a360bdf943218dbf (patch) | |
| tree | 3765d3082b94546c8ea1b23ae75e12aa7b43924b /src/libstd/sys/common | |
| parent | 34505e22289d3b2416ab0922131e8526d0d5cc0b (diff) | |
| parent | 2de6ea7a35fb53ce5e4a7e5541a2adf425b7da23 (diff) | |
| download | rust-bb4b3fb7f97924919f072ec9a360bdf943218dbf.tar.gz rust-bb4b3fb7f97924919f072ec9a360bdf943218dbf.zip | |
Auto merge of #32202 - arielb1:slice-patterns, r=nikomatsakis
Implement RFC495 semantics for slice patterns non-MIR translation is still not supported for these and will happily ICE. This is a [breaking-change] for many uses of slice_patterns. [RFC 495 text](https://github.com/rust-lang/rfcs/blob/master/text/0495-array-pattern-changes.md)
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/wtf8.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs index 55e485e5811..d705b8986d0 100644 --- a/src/libstd/sys/common/wtf8.rs +++ b/src/libstd/sys/common/wtf8.rs @@ -566,8 +566,8 @@ impl Wtf8 { if len < 3 { return None } - match &self.bytes[(len - 3)..] { - [0xED, b2 @ 0xA0...0xAF, b3] => Some(decode_surrogate(b2, b3)), + match ::slice_pat(&&self.bytes[(len - 3)..]) { + &[0xED, b2 @ 0xA0...0xAF, b3] => Some(decode_surrogate(b2, b3)), _ => None } } @@ -578,8 +578,8 @@ impl Wtf8 { if len < 3 { return None } - match &self.bytes[..3] { - [0xED, b2 @ 0xB0...0xBF, b3] => Some(decode_surrogate(b2, b3)), + match ::slice_pat(&&self.bytes[..3]) { + &[0xED, b2 @ 0xB0...0xBF, b3] => Some(decode_surrogate(b2, b3)), _ => None } } |
