Skip to content

Commit

Permalink
Get rid of all the remaining uses of refN/valN/mutN/TupleN
Browse files Browse the repository at this point in the history
  • Loading branch information
Jorge Aparicio committed Dec 14, 2014
1 parent 17a9c27 commit 029789b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/etc/unicode.py
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
4 changes: 2 additions & 2 deletions src/libstd/sys/windows/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,8 @@ fn with_envp<K, V, T, F>(env: Option<&collections::HashMap<K, V>>, cb: F) -> T w

for pair in env.iter() {
let kv = format!("{}={}",
pair.ref0().container_as_str().unwrap(),
pair.ref1().container_as_str().unwrap());
pair.0.container_as_str().unwrap(),
pair.1.container_as_str().unwrap());
blk.extend(kv.utf16_units());
blk.push(0);
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/bench/shootout-fasta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl<'a> Iterator<u8> for AAGen<'a> {
fn next(&mut self) -> Option<u8> {
let r = self.rng.gen();
self.data.iter()
.skip_while(|pc| pc.val0() < r)
.skip_while(|pc| pc.0 < r)
.map(|&(_, c)| c)
.next()
}
Expand Down

9 comments on commit 029789b

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at japaric@029789b

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging japaric/rust/deprecate-tupleN = 029789b into auto

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

japaric/rust/deprecate-tupleN = 029789b merged ok, testing candidate = 5112c41

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at japaric@029789b

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging japaric/rust/deprecate-tupleN = 029789b into auto

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

japaric/rust/deprecate-tupleN = 029789b merged ok, testing candidate = 10ac5b7

@bors
Copy link
Contributor

@bors bors commented on 029789b Dec 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 10ac5b7

Please sign in to comment.