Skip to content

Commit 8ec70ae

Browse files
borsbors
committed
auto merge of #8162 : thestinger/rust/no-copy, r=brson
2 parents 0c716c6 + b57ffef commit 8ec70ae

File tree

33 files changed

+242
-285
lines changed

33 files changed

+242
-285
lines changed

‎src/libextra/crypto/digest.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub trait DigestUtil {
6565
*
6666
* * in The string to feed into the digest
6767
*/
68-
fn input_str(&mut self, in: &str);
68+
fn input_str(&mut self, input: &str);
6969

7070
/**
7171
* Convenience functon that retrieves the result of a digest as a
@@ -75,8 +75,8 @@ pub trait DigestUtil {
7575
}
7676

7777
impl<D: Digest> DigestUtil for D {
78-
fn input_str(&mut self, in: &str) {
79-
self.input(in.as_bytes());
78+
fn input_str(&mut self, input: &str) {
79+
self.input(input.as_bytes());
8080
}
8181

8282
fn result_str(&mut self) -> ~str {

‎src/libextra/crypto/sha2.rs

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -66,34 +66,34 @@ struct Engine512 {
6666
}
6767

6868
// Convert a [u8] to a u64 in big-endian format
69-
fn to_u64(in: &[u8]) -> u64 {
70-
(in[0] as u64) << 56 |
71-
(in[1] as u64) << 48 |
72-
(in[2] as u64) << 40 |
73-
(in[3] as u64) << 32 |
74-
(in[4] as u64) << 24 |
75-
(in[5] as u64) << 16 |
76-
(in[6] as u64) << 8 |
77-
(in[7] as u64)
69+
fn to_u64(input: &[u8]) -> u64 {
70+
(input[0] as u64) << 56 |
71+
(input[1] as u64) << 48 |
72+
(input[2] as u64) << 40 |
73+
(input[3] as u64) << 32 |
74+
(input[4] as u64) << 24 |
75+
(input[5] as u64) << 16 |
76+
(input[6] as u64) << 8 |
77+
(input[7] as u64)
7878
}
7979

8080
// Convert a u64 to a [u8] in big endian format
81-
fn from_u64(in: u64, out: &mut [u8]) {
82-
out[0] = (in >> 56) as u8;
83-
out[1] = (in >> 48) as u8;
84-
out[2] = (in >> 40) as u8;
85-
out[3] = (in >> 32) as u8;
86-
out[4] = (in >> 24) as u8;
87-
out[5] = (in >> 16) as u8;
88-
out[6] = (in >> 8) as u8;
89-
out[7] = in as u8;
81+
fn from_u64(input: u64, out: &mut [u8]) {
82+
out[0] = (input >> 56) as u8;
83+
out[1] = (input >> 48) as u8;
84+
out[2] = (input >> 40) as u8;
85+
out[3] = (input >> 32) as u8;
86+
out[4] = (input >> 24) as u8;
87+
out[5] = (input >> 16) as u8;
88+
out[6] = (input >> 8) as u8;
89+
out[7] = input as u8;
9090
}
9191

9292
impl Engine512 {
93-
fn input_byte(&mut self, in: u8) {
93+
fn input_byte(&mut self, input: u8) {
9494
assert!(!self.finished)
9595

96-
self.input_buffer[self.input_buffer_idx] = in;
96+
self.input_buffer[self.input_buffer_idx] = input;
9797
self.input_buffer_idx += 1;
9898

9999
if (self.input_buffer_idx == 8) {
@@ -105,25 +105,25 @@ impl Engine512 {
105105
self.bit_counter.add_bytes(1);
106106
}
107107

108-
fn input_vec(&mut self, in: &[u8]) {
108+
fn input_vec(&mut self, input: &[u8]) {
109109
assert!(!self.finished)
110110

111111
let mut i = 0;
112112

113-
while i < in.len() && self.input_buffer_idx != 0 {
114-
self.input_byte(in[i]);
113+
while i < input.len() && self.input_buffer_idx != 0 {
114+
self.input_byte(input[i]);
115115
i += 1;
116116
}
117117

118-
while in.len() - i >= 8 {
119-
let w = to_u64(in.slice(i, i + 8));
118+
while input.len() - i >= 8 {
119+
let w = to_u64(input.slice(i, i + 8));
120120
self.process_word(w);
121121
self.bit_counter.add_bytes(8);
122122
i += 8;
123123
}
124124

125-
while i < in.len() {
126-
self.input_byte(in[i]);
125+
while i < input.len() {
126+
self.input_byte(input[i]);
127127
i += 1;
128128
}
129129
}
@@ -135,8 +135,8 @@ impl Engine512 {
135135
self.W_idx = 0;
136136
}
137137

138-
fn process_word(&mut self, in: u64) {
139-
self.W[self.W_idx] = in;
138+
fn process_word(&mut self, input: u64) {
139+
self.W[self.W_idx] = input;
140140
self.W_idx += 1;
141141
if (self.W_idx == 16) {
142142
self.W_idx = 0;
@@ -356,26 +356,26 @@ struct Engine256 {
356356
}
357357

358358
// Convert a [u8] to a u32 in big endian format
359-
fn to_u32(in: &[u8]) -> u32 {
360-
(in[0] as u32) << 24 |
361-
(in[1] as u32) << 16 |
362-
(in[2] as u32) << 8 |
363-
(in[3] as u32)
359+
fn to_u32(input: &[u8]) -> u32 {
360+
(input[0] as u32) << 24 |
361+
(input[1] as u32) << 16 |
362+
(input[2] as u32) << 8 |
363+
(input[3] as u32)
364364
}
365365

366366
// Convert a u32 to a [u8] in big endian format
367-
fn from_u32(in: u32, out: &mut [u8]) {
368-
out[0] = (in >> 24) as u8;
369-
out[1] = (in >> 16) as u8;
370-
out[2] = (in >> 8) as u8;
371-
out[3] = in as u8;
367+
fn from_u32(input: u32, out: &mut [u8]) {
368+
out[0] = (input >> 24) as u8;
369+
out[1] = (input >> 16) as u8;
370+
out[2] = (input >> 8) as u8;
371+
out[3] = input as u8;
372372
}
373373

374374
impl Engine256 {
375-
fn input_byte(&mut self, in: u8) {
375+
fn input_byte(&mut self, input: u8) {
376376
assert!(!self.finished)
377377

378-
self.input_buffer[self.input_buffer_idx] = in;
378+
self.input_buffer[self.input_buffer_idx] = input;
379379
self.input_buffer_idx += 1;
380380

381381
if (self.input_buffer_idx == 4) {
@@ -387,25 +387,25 @@ impl Engine256 {
387387
self.length_bytes += 1;
388388
}
389389

390-
fn input_vec(&mut self, in: &[u8]) {
390+
fn input_vec(&mut self, input: &[u8]) {
391391
assert!(!self.finished)
392392

393393
let mut i = 0;
394394

395-
while i < in.len() && self.input_buffer_idx != 0 {
396-
self.input_byte(in[i]);
395+
while i < input.len() && self.input_buffer_idx != 0 {
396+
self.input_byte(input[i]);
397397
i += 1;
398398
}
399399

400-
while in.len() - i >= 4 {
401-
let w = to_u32(in.slice(i, i + 4));
400+
while input.len() - i >= 4 {
401+
let w = to_u32(input.slice(i, i + 4));
402402
self.process_word(w);
403403
self.length_bytes += 4;
404404
i += 4;
405405
}
406406

407-
while i < in.len() {
408-
self.input_byte(in[i]);
407+
while i < input.len() {
408+
self.input_byte(input[i]);
409409
i += 1;
410410
}
411411

@@ -418,8 +418,8 @@ impl Engine256 {
418418
self.W_idx = 0;
419419
}
420420

421-
fn process_word(&mut self, in: u32) {
422-
self.W[self.W_idx] = in;
421+
fn process_word(&mut self, input: u32) {
422+
self.W[self.W_idx] = input;
423423
self.W_idx += 1;
424424
if (self.W_idx == 16) {
425425
self.W_idx = 0;

‎src/libextra/fileinput.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ input, skips the current file and then numbers the remaining lines
7272
(where the numbers are from the start of each file, rather than the
7373
total line count).
7474
75-
let in = FileInput::from_vec(pathify([~"a.txt", ~"b.txt", ~"c.txt"],
75+
let input = FileInput::from_vec(pathify([~"a.txt", ~"b.txt", ~"c.txt"],
7676
true));
7777
78-
for in.each_line |line| {
78+
for input.each_line |line| {
7979
if line.is_empty() {
8080
break
8181
}
@@ -85,9 +85,9 @@ total line count).
8585
io::println("Continue?");
8686
8787
if io::stdin().read_line() == ~"yes" {
88-
in.next_file(); // skip!
88+
input.next_file(); // skip!
8989
90-
for in.each_line_state |line, state| {
90+
for input.each_line_state |line, state| {
9191
io::println(fmt!("%u: %s", state.line_num_file,
9292
line))
9393
}
@@ -589,29 +589,29 @@ mod test {
589589
make_file(filename.get_ref(), contents);
590590
}
591591
592-
let in = FileInput::from_vec(filenames);
592+
let input = FileInput::from_vec(filenames);
593593
594594
// read once from 0
595-
assert_eq!(in.read_line(), ~"0 1");
596-
in.next_file(); // skip the rest of 1
595+
assert_eq!(input.read_line(), ~"0 1");
596+
input.next_file(); // skip the rest of 1
597597
598598
// read all lines from 1 (but don't read any from 2),
599599
for uint::range(1, 4) |i| {
600-
assert_eq!(in.read_line(), fmt!("1 %u", i));
600+
assert_eq!(input.read_line(), fmt!("1 %u", i));
601601
}
602602
// 1 is finished, but 2 hasn't been started yet, so this will
603603
// just "skip" to the beginning of 2 (Python's fileinput does
604604
// the same)
605-
in.next_file();
605+
input.next_file();
606606
607-
assert_eq!(in.read_line(), ~"2 1");
607+
assert_eq!(input.read_line(), ~"2 1");
608608
}
609609
610610
#[test]
611611
#[should_fail]
612612
fn test_input_vec_missing_file() {
613613
for input_vec(pathify([~"this/file/doesnt/exist"], true)) |line| {
614-
io::println(line);
614+
println(line);
615615
}
616616
}
617617
}

‎src/libextra/flate.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,18 @@ mod tests {
9595
words.push(r.gen_bytes(range));
9696
}
9797
for 20.times {
98-
let mut in = ~[];
98+
let mut input = ~[];
9999
for 2000.times {
100-
in.push_all(r.choose(words));
100+
input.push_all(r.choose(words));
101101
}
102102
debug!("de/inflate of %u bytes of random word-sequences",
103-
in.len());
104-
let cmp = deflate_bytes(in);
103+
input.len());
104+
let cmp = deflate_bytes(input);
105105
let out = inflate_bytes(cmp);
106106
debug!("%u bytes deflated to %u (%.1f%% size)",
107-
in.len(), cmp.len(),
108-
100.0 * ((cmp.len() as float) / (in.len() as float)));
109-
assert_eq!(in, out);
107+
input.len(), cmp.len(),
108+
100.0 * ((cmp.len() as float) / (input.len() as float)));
109+
assert_eq!(input, out);
110110
}
111111
}
112112
}

‎src/libextra/semver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub fn parse(s: &str) -> Option<Version> {
221221
}
222222
let s = s.trim();
223223
let mut bad = false;
224-
do bad_parse::cond.trap(|_| { debug!("bad"); bad = true }).in {
224+
do bad_parse::cond.trap(|_| { debug!("bad"); bad = true }).inside {
225225
do io::with_str_reader(s) |rdr| {
226226
let v = parse_reader(rdr);
227227
if bad || v.to_str() != s.to_owned() {

‎src/libextra/url.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ fn get_authority(rawurl: &str) ->
407407

408408
let len = rawurl.len();
409409
let mut st = Start;
410-
let mut in = Digit; // most restricted, start here.
410+
let mut input = Digit; // most restricted, start here.
411411

412412
let mut userinfo = None;
413413
let mut host = ~"";
@@ -425,13 +425,13 @@ fn get_authority(rawurl: &str) ->
425425
match c {
426426
'0' .. '9' => (),
427427
'A' .. 'F' | 'a' .. 'f' => {
428-
if in == Digit {
429-
in = Hex;
428+
if input == Digit {
429+
input = Hex;
430430
}
431431
}
432432
'G' .. 'Z' | 'g' .. 'z' | '-' | '.' | '_' | '~' | '%' |
433433
'&' |'\'' | '(' | ')' | '+' | '!' | '*' | ',' | ';' | '=' => {
434-
in = Unreserved;
434+
input = Unreserved;
435435
}
436436
':' | '@' | '?' | '#' | '/' => {
437437
// separators, don't change anything
@@ -452,7 +452,7 @@ fn get_authority(rawurl: &str) ->
452452
}
453453
PassHostPort => {
454454
// multiple colons means ipv6 address.
455-
if in == Unreserved {
455+
if input == Unreserved {
456456
return Err(
457457
~"Illegal characters in IPv6 address.");
458458
}
@@ -461,13 +461,13 @@ fn get_authority(rawurl: &str) ->
461461
InHost => {
462462
pos = i;
463463
// can't be sure whether this is an ipv6 address or a port
464-
if in == Unreserved {
464+
if input == Unreserved {
465465
return Err(~"Illegal characters in authority.");
466466
}
467467
st = Ip6Port;
468468
}
469469
Ip6Port => {
470-
if in == Unreserved {
470+
if input == Unreserved {
471471
return Err(~"Illegal characters in authority.");
472472
}
473473
st = Ip6Host;
@@ -483,11 +483,11 @@ fn get_authority(rawurl: &str) ->
483483
return Err(~"Invalid ':' in authority.");
484484
}
485485
}
486-
in = Digit; // reset input class
486+
input = Digit; // reset input class
487487
}
488488

489489
'@' => {
490-
in = Digit; // reset input class
490+
input = Digit; // reset input class
491491
colon_count = 0; // reset count
492492
match st {
493493
Start => {
@@ -535,7 +535,7 @@ fn get_authority(rawurl: &str) ->
535535
}
536536
}
537537
PassHostPort | Ip6Port => {
538-
if in != Digit {
538+
if input != Digit {
539539
return Err(~"Non-digit characters in port.");
540540
}
541541
host = rawurl.slice(begin, pos).to_owned();
@@ -545,7 +545,7 @@ fn get_authority(rawurl: &str) ->
545545
host = rawurl.slice(begin, end).to_owned();
546546
}
547547
InPort => {
548-
if in != Digit {
548+
if input != Digit {
549549
return Err(~"Non-digit characters in port.");
550550
}
551551
port = Some(rawurl.slice(pos+1, end).to_owned());

‎src/librustc/middle/lint.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -706,8 +706,8 @@ fn check_item_ctypes(cx: &Context, it: &ast::item) {
706706
}
707707

708708
fn check_foreign_fn(cx: &Context, decl: &ast::fn_decl) {
709-
for decl.inputs.iter().advance |in| {
710-
check_ty(cx, &in.ty);
709+
for decl.inputs.iter().advance |input| {
710+
check_ty(cx, &input.ty);
711711
}
712712
check_ty(cx, &decl.output)
713713
}

0 commit comments

Comments
 (0)