Skip to content

Commit 7d317fe

Browse files
committed
std: remove unused 'mut' variables
1 parent 13537d2 commit 7d317fe

File tree

9 files changed

+20
-22
lines changed

9 files changed

+20
-22
lines changed

src/libstd/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,7 @@ mod tests {
891891
#[test]
892892
fn test_0_elements() {
893893
let mut act;
894-
let mut exp;
894+
let exp;
895895
act = Bitv::new(0u, false);
896896
exp = vec::from_elem::<uint>(0u, 0u);
897897
assert!(act.eq_vec(exp));

src/libstd/deque.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ pub impl<T> Deque<T> {
113113
///
114114
/// Fails if the deque is empty
115115
fn pop_front(&mut self) -> T {
116-
let mut result = self.elts[self.lo].swap_unwrap();
116+
let result = self.elts[self.lo].swap_unwrap();
117117
self.lo = (self.lo + 1u) % self.elts.len();
118118
self.nelts -= 1u;
119119
result
@@ -126,7 +126,7 @@ pub impl<T> Deque<T> {
126126
if self.hi == 0u {
127127
self.hi = self.elts.len() - 1u;
128128
} else { self.hi -= 1u; }
129-
let mut result = self.elts[self.hi].swap_unwrap();
129+
let result = self.elts[self.hi].swap_unwrap();
130130
self.elts[self.hi] = None;
131131
self.nelts -= 1u;
132132
result
@@ -204,7 +204,7 @@ pub impl<T> Deque<T> {
204204
///
205205
/// Fails if the deque is empty
206206
fn pop_front(&mut self) -> T {
207-
let mut result = self.elts[self.lo].swap_unwrap();
207+
let result = self.elts[self.lo].swap_unwrap();
208208
self.lo = (self.lo + 1u) % self.elts.len();
209209
self.nelts -= 1u;
210210
result
@@ -217,7 +217,7 @@ pub impl<T> Deque<T> {
217217
if self.hi == 0u {
218218
self.hi = self.elts.len() - 1u;
219219
} else { self.hi -= 1u; }
220-
let mut result = self.elts[self.hi].swap_unwrap();
220+
let result = self.elts[self.hi].swap_unwrap();
221221
self.elts[self.hi] = None;
222222
self.nelts -= 1u;
223223
result

src/libstd/dlist.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ pub impl<T> DList<T> {
220220
* node. O(1).
221221
*/
222222
fn push_head_n(@mut self, data: T) -> @mut DListNode<T> {
223-
let mut nobe = DList::new_link(data);
223+
let nobe = DList::new_link(data);
224224
self.add_head(nobe);
225225
nobe.get()
226226
}
@@ -233,7 +233,7 @@ pub impl<T> DList<T> {
233233
* node. O(1).
234234
*/
235235
fn push_n(@mut self, data: T) -> @mut DListNode<T> {
236-
let mut nobe = DList::new_link(data);
236+
let nobe = DList::new_link(data);
237237
self.add_tail(nobe);
238238
nobe.get()
239239
}
@@ -263,7 +263,7 @@ pub impl<T> DList<T> {
263263
data: T,
264264
neighbour: @mut DListNode<T>
265265
) -> @mut DListNode<T> {
266-
let mut nobe = DList::new_link(data);
266+
let nobe = DList::new_link(data);
267267
self.insert_left(nobe, neighbour);
268268
nobe.get()
269269
}
@@ -293,7 +293,7 @@ pub impl<T> DList<T> {
293293
data: T,
294294
neighbour: @mut DListNode<T>
295295
) -> @mut DListNode<T> {
296-
let mut nobe = DList::new_link(data);
296+
let nobe = DList::new_link(data);
297297
self.insert_right(neighbour, nobe);
298298
nobe.get()
299299
}

src/libstd/num/rational.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl<T: Copy + Div<T,T> + Modulo<T,T> + Neg<T> + Zero + One + Ord + Eq>
6060
6161
/// Put self into lowest terms, with denom > 0.
6262
fn reduce(&mut self) {
63-
let mut g : T = gcd(self.numer, self.denom);
63+
let g : T = gcd(self.numer, self.denom);
6464
6565
self.numer /= g;
6666
self.denom /= g;
@@ -508,4 +508,4 @@ mod test {
508508
test(s);
509509
}
510510
}
511-
}
511+
}

src/libstd/rope.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,7 @@ pub mod node {
838838
option::None => break,
839839
option::Some(x) => {
840840
//FIXME (#2744): Replace with memcpy or something similar
841-
let mut local_buf: ~[u8] =
842-
cast::transmute(*x.content);
841+
let local_buf: ~[u8] = cast::transmute(*x.content);
843842
let mut i = x.byte_offset;
844843
while i < x.byte_len {
845844
buf[offset] = local_buf[i];
@@ -1156,7 +1155,7 @@ pub mod node {
11561155
}
11571156

11581157
pub fn empty() -> T {
1159-
let mut stack : ~[@Node] = ~[];
1158+
let stack : ~[@Node] = ~[];
11601159
T { stack: stack, stackpos: -1 }
11611160
}
11621161

src/libstd/sha1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub fn sha1() -> @Sha1 {
9393
assert!((vec::len(st.h) == digest_buf_len));
9494
assert!((vec::uniq_len(st.work_buf) == work_buf_len));
9595
let mut t: int; // Loop counter
96-
let mut w = st.work_buf;
96+
let w = st.work_buf;
9797

9898
// Initialize the first 16 words of the vector w
9999
t = 0;
@@ -260,7 +260,7 @@ pub fn sha1() -> @Sha1 {
260260
return s;
261261
}
262262
}
263-
let mut st = Sha1State {
263+
let st = Sha1State {
264264
h: vec::from_elem(digest_buf_len, 0u32),
265265
len_low: 0u32,
266266
len_high: 0u32,

src/libstd/sort.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ fn binarysort<T:Copy + Ord>(array: &mut [T], start: uint) {
239239
}
240240
}
241241
assert!(left == right);
242-
let mut n = start-left;
242+
let n = start-left;
243243

244244
copy_vec(array, left+1, array, left, n);
245245
array[left] = pivot;
@@ -416,7 +416,7 @@ impl<T:Copy + Ord> MergeState<T> {
416416
}
417417

418418
fn merge_at(&mut self, n: uint, array: &mut [T]) {
419-
let mut size = self.runs.len();
419+
let size = self.runs.len();
420420
assert!(size >= 2);
421421
assert!(n == size-2 || n == size-3);
422422

src/libstd/test.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,7 @@ fn run_tests(opts: &TestOpts,
427427
let filtered_descs = filtered_tests.map(|t| t.desc);
428428
callback(TeFiltered(filtered_descs));
429429
430-
let mut (filtered_tests,
431-
filtered_benchs) =
430+
let (filtered_tests, filtered_benchs) =
432431
do vec::partition(filtered_tests) |e| {
433432
match e.testfn {
434433
StaticTestFn(_) | DynTestFn(_) => true,

src/libstd/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pub fn empty_tm() -> Tm {
147147
/// Returns the specified time in UTC
148148
pub fn at_utc(clock: Timespec) -> Tm {
149149
unsafe {
150-
let mut Timespec { sec, nsec } = clock;
150+
let Timespec { sec, nsec } = clock;
151151
let mut tm = empty_tm();
152152
rustrt::rust_gmtime(sec, nsec, &mut tm);
153153
tm
@@ -162,7 +162,7 @@ pub fn now_utc() -> Tm {
162162
/// Returns the specified time in the local timezone
163163
pub fn at(clock: Timespec) -> Tm {
164164
unsafe {
165-
let mut Timespec { sec, nsec } = clock;
165+
let Timespec { sec, nsec } = clock;
166166
let mut tm = empty_tm();
167167
rustrt::rust_localtime(sec, nsec, &mut tm);
168168
tm

0 commit comments

Comments
 (0)