Merge all 3 log syntaxes, tidy up residual misuses.

1 files changed, 8 insertions, 9 deletions

diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index 73d24d7cd54..3b6a45b9060 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -143,17 +143,16 @@ mod chained {
         while true {
             alt e0.next {
               absent. {
-                log("search_tbl", "absent", "comparisons", comp,
-                    "hash", h, "idx", idx);
-
+                #debug("search_tbl: absent, comp %u, hash %u, idx %u",
+                       comp, h, idx);
                 ret not_found;
               }
               present(e1) {
                 comp += 1u;
                 let e1_key = e1.key; // Satisfy alias checker.
                 if e1.hash == h && tbl.eqer(e1_key, k) {
-                    log("search_tbl", "present", "comparisons", comp,
-                        "hash", h, "idx", idx);
+                    #debug("search_tbl: present, comp %u, hash %u, idx %u",
+                           comp, h, idx);
                     ret found_after(e0, e1);
                 } else {
                     e0 = e1;
@@ -169,15 +168,15 @@ mod chained {
         let idx = h % vec::len(tbl.chains);
         alt tbl.chains[idx] {
           absent. {
-            log("search_tbl", "absent", "comparisons", 0u,
-                "hash", h, "idx", idx);
+            #debug("search_tbl: absent, comp %u, hash %u, idx %u",
+                   0u, h, idx);
             ret not_found;
           }
           present(e) {
             let e_key = e.key; // Satisfy alias checker.
             if e.hash == h && tbl.eqer(e_key, k) {
-                log("search_tbl", "present", "comparisons", 1u,
-                    "hash", h, "idx", idx);
+                #debug("search_tbl: present, comp %u, hash %u, idx %u",
+                       1u, h, idx);
                 ret found_first(idx, e);
             } else {
                 ret search_rem(tbl, k, h, idx, e);