From 563172a73be64aa2b0f528346095aba566753d14 Mon Sep 17 00:00:00 2001
From: Tim Chevalier <chevalier@alum.wellesley.edu>
Date: Sat, 13 Jul 2013 13:38:07 -0700
Subject: [PATCH] rustpkg: Address review comments from cmr

---
 src/librustpkg/installed_packages.rs                    | 4 ++--
 src/librustpkg/testsuite/pass/src/install-paths/main.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/librustpkg/installed_packages.rs b/src/librustpkg/installed_packages.rs
index 2716cc5d5b5..980b00d3864 100644
--- a/src/librustpkg/installed_packages.rs
+++ b/src/librustpkg/installed_packages.rs
@@ -15,7 +15,7 @@ use std::os;
 
 pub fn list_installed_packages(f: &fn(&PkgId) -> bool) -> bool  {
     let workspaces = rust_path();
-    for workspaces.iter().advance() |p| {
+    for workspaces.iter().advance |p| {
         let binfiles = os::list_dir(&p.push("bin"));
         for binfiles.iter().advance() |exec| {
             f(&PkgId::new(*exec));
@@ -30,7 +30,7 @@ pub fn list_installed_packages(f: &fn(&PkgId) -> bool) -> bool  {
 
 pub fn package_is_installed(p: &PkgId) -> bool {
     let mut is_installed = false;
-    let _ = do list_installed_packages() |installed| {
+    do list_installed_packages() |installed| {
         if installed == p {
             is_installed = true;
         }
diff --git a/src/librustpkg/testsuite/pass/src/install-paths/main.rs b/src/librustpkg/testsuite/pass/src/install-paths/main.rs
index 3be03b6278b..431350c07b4 100644
--- a/src/librustpkg/testsuite/pass/src/install-paths/main.rs
+++ b/src/librustpkg/testsuite/pass/src/install-paths/main.rs
@@ -24,5 +24,5 @@ use lib::f;
 mod lib;
 
 fn main() {
-    let _ = f();
+    f();
 }