Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement RFC495 semantics for slice patterns #32202

Merged
merged 15 commits into from
Jun 9, 2016
Merged

Implement RFC495 semantics for slice patterns #32202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
719a591
mir: distinguish between variable visibility scopes and SEME scopes.
eddyb May 31, 2016
0c5930e
mir: group span + visibility scope under a new SourceInfo type.
eddyb Jun 7, 2016
70c25c8
remove the librustc_trans -> librustc_mir dependency
arielb1 Jun 5, 2016
088b7e2
fix translation of unsized types and arrays
arielb1 Mar 13, 2016
5c717a6
implement RFC495 semantics for slice patterns
arielb1 Mar 11, 2016
1a614f8
wrap calls to `lvalue_ty`
arielb1 Jun 5, 2016
5af5f26
handle string literals correctly in match checking
arielb1 Jun 5, 2016
8ac3b46
address review comments
arielb1 Jun 5, 2016
b2100cc
fix damage in librustc
arielb1 Jun 6, 2016
a673ced
fix stdtest
arielb1 Jun 6, 2016
5cf4139
fix tests
arielb1 Jun 6, 2016
fcabfa9
add an help message when using an old-style slice pattern
arielb1 Jun 7, 2016
9b1abf5
remove residual slice pattern junk from mem_categorization
arielb1 Jun 7, 2016
f0174fc
use the slice_pat hack in libstd too
arielb1 Jun 8, 2016
2de6ea7
fix Cargo.lock
arielb1 Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use the slice_pat hack in libstd too
  • Loading branch information
@arielb1
arielb1 committed Jun 8, 2016
commit f0174fcbee229c67ebfdae9012628891a55be7aa
12 changes: 12 additions & 0 deletions src/libstd/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,3 +467,15 @@ pub mod __rand {
// the rustdoc documentation for primitive types. Using `include!`
// because rustdoc only looks for these modules at the crate level.
include!("primitive_docs.rs");

// FIXME(stage0): remove this after a snapshot
// HACK: this is needed because the interpretation of slice
// patterns changed between stage0 and now.
#[cfg(stage0)]
fn slice_pat<'a, 'b, T>(t: &'a &'b [T]) -> &'a &'b [T] {
t
}
#[cfg(not(stage0))]
fn slice_pat<'a, 'b, T>(t: &'a &'b [T]) -> &'b [T] {
*t
}
21 changes: 6 additions & 15 deletions src/libstd/sys/common/wtf8.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,20 +560,15 @@ impl Wtf8 {
}
}

// FIXME(stage0): use slice patterns after snapshot
#[inline]
fn final_lead_surrogate(&self) -> Option<u16> {
let len = self.len();
if len < 3 {
return None
}
if self.bytes[len-3] == 0xed &&
self.bytes[len-2] >= 0xa0 &&
self.bytes[len-2] <= 0xaf
{
Some(decode_surrogate(self.bytes[len-2], self.bytes[len-1]))
} else {
None
match ::slice_pat(&&self.bytes[(len - 3)..]) {
&[0xED, b2 @ 0xA0...0xAF, b3] => Some(decode_surrogate(b2, b3)),
_ => None
}
}

Expand All @@ -583,13 +578,9 @@ impl Wtf8 {
if len < 3 {
return None
}
if self.bytes[0] == 0xed &&
self.bytes[1] >= 0xb0 &&
self.bytes[1] <= 0xbf
{
Some(decode_surrogate(self.bytes[1], self.bytes[2]))
} else {
None
match ::slice_pat(&&self.bytes[..3]) {
&[0xED, b2 @ 0xB0...0xBF, b3] => Some(decode_surrogate(b2, b3)),
_ => None
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/libstd/sys/windows/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,10 @@ impl Drop for FindNextFileHandle {

impl DirEntry {
fn new(root: &Arc<PathBuf>, wfd: &c::WIN32_FIND_DATAW) -> Option<DirEntry> {
match &wfd.cFileName[0..3] {
match ::slice_pat(&&wfd.cFileName[0..3]) {
// check for '.' and '..'
[46, 0, ..] |
[46, 46, 0, ..] => return None,
&[46, 0, ..] |
&[46, 46, 0, ..] => return None,
_ => {}
}

Expand Down