From efe4c6af23527e19020b707a18597232cb99f2c1 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 1 Apr 2012 15:05:29 -0700
Subject: [PATCH] core: Use the or binop instead of the double-star binop

---
 src/libcore/os.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index d7e4af2a15ac..16a5b0f36f2f 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -458,7 +458,7 @@ fn list_dir(p: path) -> [str] {
     fn star(p: str) -> str {
         let pl = str::len(p);
         if pl == 0u || (p[pl - 1u] as char != path::consts::path_sep
-                        ** p[pl - 1u] as char != path::consts::alt_path_sep) {
+                        || p[pl - 1u] as char != path::consts::alt_path_sep) {
             p + path::path_sep() + "*"
         } else {
             p + "*"