Get rid of all the remaining uses of refN/valN/mutN/TupleN
This commit is contained in:
parent
17a9c2764f
commit
029789b98c
3 changed files with 5 additions and 6 deletions
|
|
@ -348,7 +348,6 @@ 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;
|
||||
|
|
@ -356,14 +355,14 @@ def emit_conversions_module(f, lowerupper, upperlower):
|
|||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue