Skip to content

Commit 785b9f9

Browse files
committed
---
yaml --- r: 163455 b: refs/heads/snap-stage3 c: 98c4d4b h: refs/heads/master i: 163453: e85d844 163451: 6844554 163447: 9ccfabe 163439: 1a45e19 163423: 9b4e147 163391: a44538f 163327: ea191f7 v: v3
1 parent a88d0e5 commit 785b9f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+562
-783
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: b497f050081886803682adc081ddb1e8c4a59a57
4+
refs/heads/snap-stage3: 98c4d4b7f45cfdf39f5fcd84aaf0c49c5b17dc25
55
refs/heads/try: 20cbbffeefc1f35e2ea63afce7b42fbd79611d42
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/etc/unicode.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def emit_bsearch_range_table(f):
289289
f.write("""
290290
fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool {
291291
use core::cmp::Ordering::{Equal, Less, Greater};
292-
use core::slice::SliceExt;
292+
use core::slice::SlicePrelude;
293293
r.binary_search(|&(lo,hi)| {
294294
if lo <= c && c <= hi { Equal }
295295
else if hi < c { Less }
@@ -347,7 +347,7 @@ def emit_conversions_module(f, lowerupper, upperlower):
347347
f.write("pub mod conversions {")
348348
f.write("""
349349
use core::cmp::Ordering::{Equal, Less, Greater};
350-
use core::slice::SliceExt;
350+
use core::slice::SlicePrelude;
351351
use core::option::Option;
352352
use core::option::Option::{Some, None};
353353
use core::slice;
@@ -386,8 +386,8 @@ def emit_conversions_module(f, lowerupper, upperlower):
386386

387387
def emit_grapheme_module(f, grapheme_table, grapheme_cats):
388388
f.write("""pub mod grapheme {
389+
use core::slice::SlicePrelude;
389390
use core::kinds::Copy;
390-
use core::slice::SliceExt;
391391
pub use self::GraphemeCat::*;
392392
use core::slice;
393393
@@ -431,7 +431,7 @@ def emit_charwidth_module(f, width_table):
431431
f.write("pub mod charwidth {\n")
432432
f.write(" use core::option::Option;\n")
433433
f.write(" use core::option::Option::{Some, None};\n")
434-
f.write(" use core::slice::SliceExt;\n")
434+
f.write(" use core::slice::SlicePrelude;\n")
435435
f.write(" use core::slice;\n")
436436
f.write("""
437437
fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 {
@@ -531,7 +531,7 @@ def comp_pfun(char):
531531
f.write("""
532532
fn bsearch_range_value_table(c: char, r: &'static [(char, char, u8)]) -> u8 {
533533
use core::cmp::Ordering::{Equal, Less, Greater};
534-
use core::slice::SliceExt;
534+
use core::slice::SlicePrelude;
535535
use core::slice;
536536
match r.binary_search(|&(lo, hi, _)| {
537537
if lo <= c && c <= hi { Equal }

branches/snap-stage3/src/libcollections/hash/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ mod tests {
297297
use core::kinds::Sized;
298298
use std::mem;
299299

300-
use slice::SliceExt;
300+
use slice::SlicePrelude;
301301
use super::{Hash, Hasher, Writer};
302302

303303
struct MyWriterHasher;

branches/snap-stage3/src/libcollections/hash/sip.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ mod tests {
276276

277277
use str::Str;
278278
use string::String;
279-
use slice::{AsSlice, SliceExt};
279+
use slice::{AsSlice, SlicePrelude};
280280
use vec::Vec;
281281

282282
use super::super::{Hash, Writer};

branches/snap-stage3/src/libcollections/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#![allow(unknown_features)]
2525
#![feature(macro_rules, default_type_params, phase, globs)]
2626
#![feature(unsafe_destructor, import_shadowing, slicing_syntax)]
27-
#![feature(unboxed_closures)]
27+
#![feature(tuple_indexing, unboxed_closures)]
2828
#![no_std]
2929

3030
#[phase(plugin, link)] extern crate core;

0 commit comments

Comments
 (0)