Skip to content

Commit 029789b

Browse files
author
Jorge Aparicio
committed
Get rid of all the remaining uses of refN/valN/mutN/TupleN
1 parent 17a9c27 commit 029789b

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/etc/unicode.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,22 +348,21 @@ def emit_conversions_module(f, lowerupper, upperlower):
348348
f.write("""
349349
use core::cmp::Ordering::{Equal, Less, Greater};
350350
use core::slice::SlicePrelude;
351-
use core::tuple::Tuple2;
352351
use core::option::Option;
353352
use core::option::Option::{Some, None};
354353
use core::slice;
355354
356355
pub fn to_lower(c: char) -> char {
357356
match bsearch_case_table(c, LuLl_table) {
358357
None => c,
359-
Some(index) => LuLl_table[index].val1()
358+
Some(index) => LuLl_table[index].1
360359
}
361360
}
362361
363362
pub fn to_upper(c: char) -> char {
364363
match bsearch_case_table(c, LlLu_table) {
365364
None => c,
366-
Some(index) => LlLu_table[index].val1()
365+
Some(index) => LlLu_table[index].1
367366
}
368367
}
369368

src/libstd/sys/windows/process.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@ fn with_envp<K, V, T, F>(env: Option<&collections::HashMap<K, V>>, cb: F) -> T w
430430

431431
for pair in env.iter() {
432432
let kv = format!("{}={}",
433-
pair.ref0().container_as_str().unwrap(),
434-
pair.ref1().container_as_str().unwrap());
433+
pair.0.container_as_str().unwrap(),
434+
pair.1.container_as_str().unwrap());
435435
blk.extend(kv.utf16_units());
436436
blk.push(0);
437437
}

src/test/bench/shootout-fasta.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl<'a> Iterator<u8> for AAGen<'a> {
7878
fn next(&mut self) -> Option<u8> {
7979
let r = self.rng.gen();
8080
self.data.iter()
81-
.skip_while(|pc| pc.val0() < r)
81+
.skip_while(|pc| pc.0 < r)
8282
.map(|&(_, c)| c)
8383
.next()
8484
}

0 commit comments

Comments
 (0)