diff --git a/src/tail/tail.rs b/src/tail/tail.rs index 696f927b1..943c1da6a 100644 --- a/src/tail/tail.rs +++ b/src/tail/tail.rs @@ -222,7 +222,7 @@ fn tail_lines(reader: &mut BufferedReader, mut line_count: uint, b if line_count <= ringbuf.len() { ringbuf.pop_front(); } - ringbuf.push(line); + ringbuf.push_back(line); } Err(err) => panic!(err) } @@ -250,7 +250,7 @@ fn tail_bytes(reader: &mut BufferedReader, mut byte_count: uint, b if byte_count <= ringbuf.len() { ringbuf.pop_front(); } - ringbuf.push(byte); + ringbuf.push_back(byte); } Err(err) => panic!(err) } diff --git a/src/test/test.rs b/src/test/test.rs index 38b1069f1..f342b3311 100644 --- a/src/test/test.rs +++ b/src/test/test.rs @@ -219,7 +219,7 @@ fn parse_expr_helper<'a>(hashmap: &HashMap<&'a [u8], Precedence>, mut lhs: bool, min_prec: Precedence, error: &mut bool) -> bool { - let mut prec = *hashmap.find(&args[0]).unwrap_or_else(|| { + let mut prec = *hashmap.get(&args[0]).unwrap_or_else(|| { *error = true; &min_prec }); @@ -228,7 +228,7 @@ fn parse_expr_helper<'a>(hashmap: &HashMap<&'a [u8], Precedence>, *args = (*args).slice_from(1); let mut rhs = dispatch(args, error); while args.len() > 0 { - let subprec = *hashmap.find(&args[0]).unwrap_or_else(|| { + let subprec = *hashmap.get(&args[0]).unwrap_or_else(|| { *error = true; &min_prec }); @@ -249,7 +249,7 @@ fn parse_expr_helper<'a>(hashmap: &HashMap<&'a [u8], Precedence>, _ => unreachable!() }; if args.len() > 0 { - prec = *hashmap.find(&args[0]).unwrap_or_else(|| { + prec = *hashmap.get(&args[0]).unwrap_or_else(|| { *error = true; &min_prec }); diff --git a/src/tr/tr.rs b/src/tr/tr.rs index aba9a6bc6..7036b2ca4 100644 --- a/src/tr/tr.rs +++ b/src/tr/tr.rs @@ -123,7 +123,7 @@ fn tr(set1: &[char], set2: &[char]) { for c in stdin().chars() { match c { Ok(inc) => { - let trc = match map.find(&(inc as uint)) { + let trc = match map.get(&(inc as uint)) { Some(t) => *t, None => inc, }; diff --git a/src/tsort/tsort.rs b/src/tsort/tsort.rs index c765bf2e7..0f320c259 100644 --- a/src/tsort/tsort.rs +++ b/src/tsort/tsort.rs @@ -126,7 +126,7 @@ impl Graph { } fn has_edge(&self, from: &String, to: &String) -> bool { - self.in_edges.find(to).unwrap().contains(from) + self.in_edges.get(to).unwrap().contains(from) } fn init_node(&mut self, n: &String) { @@ -144,8 +144,8 @@ impl Graph { } if !self.has_edge(from, to) { - self.in_edges.find_mut(to).unwrap().insert(from.clone()); - self.out_edges.find_mut(from).unwrap().push(to.clone()); + self.in_edges.get_mut(to).unwrap().insert(from.clone()); + self.out_edges.get_mut(from).unwrap().push(to.clone()); } } @@ -164,9 +164,9 @@ impl Graph { self.result.push(n.clone()); - let n_out_edges = self.out_edges.find_mut(&n).unwrap(); + let n_out_edges = self.out_edges.get_mut(&n).unwrap(); for m in n_out_edges.iter() { - let m_in_edges = self.in_edges.find_mut(m).unwrap(); + let m_in_edges = self.in_edges.get_mut(m).unwrap(); m_in_edges.remove(&n); // If m doesn't have other in-coming edges add it to start_nodes