Skip to content

Deprecate the TupleN traits, and stop using them internally #19677

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

Merged
merged 13 commits into from
Dec 14, 2014
Merged

Deprecate the TupleN traits, and stop using them internally #19677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0c9b6ae
Deprecate the `TupleN` traits
Dec 9, 2014
2e8963d
libunicode: use tuple indexing
Dec 9, 2014
4deb27e
libcollections: use tuple indexing
Dec 9, 2014
fe48a65
libstd: use tuple indexing
Dec 9, 2014
4fd6a99
libregex: use tuple indexing
Dec 9, 2014
c434954
libsyntax: use tuple indexing
Dec 9, 2014
821b836
librustc: use tuple indexing
Dec 9, 2014
0c5d22c
librustc_trans: use tuple indexing
Dec 9, 2014
e792338
librustdoc: use tuple indexing
Dec 9, 2014
778be74
libcoretest: use tuple indexing
Dec 9, 2014
8720174
libgraphviz: use tuple indexing
Dec 9, 2014
17a9c27
libcore: allow deprecated `valN` methods on doc tests
Dec 9, 2014
029789b
Get rid of all the remaining uses of `refN`/`valN`/`mutN`/`TupleN`
Dec 13, 2014
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
5 changes: 2 additions & 3 deletions src/etc/unicode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,22 +348,21 @@ def emit_conversions_module(f, lowerupper, upperlower):
f.write("""
use core::cmp::Ordering::{Equal, Less, Greater};
use core::slice::SlicePrelude;
use core::tuple::Tuple2;
use core::option::Option;
use core::option::Option::{Some, None};
use core::slice;

pub fn to_lower(c: char) -> char {
match bsearch_case_table(c, LuLl_table) {
None => c,
Some(index) => LuLl_table[index].val1()
Some(index) => LuLl_table[index].1
}
}

pub fn to_upper(c: char) -> char {
match bsearch_case_table(c, LlLu_table) {
None => c,
Some(index) => LlLu_table[index].val1()
Some(index) => LlLu_table[index].1
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libcollections/str.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ use core::iter::AdditiveIterator;
use core::kinds::Sized;
use core::prelude::{Char, Clone, Eq, Equiv};
use core::prelude::{Iterator, IteratorExt, SlicePrelude, None, Option, Ord, Ordering};
use core::prelude::{PartialEq, PartialOrd, Result, AsSlice, Some, Tuple2};
use core::prelude::{PartialEq, PartialOrd, Result, AsSlice, Some};
use core::prelude::{range};

use hash;
Expand Down Expand Up @@ -185,8 +185,8 @@ fn canonical_sort(comb: &mut [(char, u8)]) {
for i in range(0, len) {
let mut swapped = false;
for j in range(1, len-i) {
let class_a = *comb[j-1].ref1();
let class_b = *comb[j].ref1();
let class_a = comb[j-1].1;
let class_b = comb[j].1;
if class_a != 0 && class_b != 0 && class_a > class_b {
comb.swap(j-1, j);
swapped = true;
Expand Down
Loading