---

yaml
---
r: 8023
b: refs/heads/snap-stage3
c: 31b0d1b
h: refs/heads/master
i:
  8021: dd24476
  8019: 5eb2491
  8015: 38d4e66
v: v3

Author: thomaslee

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 633e4502e76811183208b5d1e107c4ccde2ce36c
+refs/heads/snap-stage3: 31b0d1b4bdf47554604bd4962d8d940c5e29cc7a
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/comp/middle/ty.rs

@@ -1588,7 +1588,7 @@ fn method_idx(id: ast::ident, meths: [method]) -> option<uint> {
 
 fn sort_methods(meths: [method]) -> [method] {
     fn method_lteq(a: method, b: method) -> bool {
-        ret str::lteq(a.ident, b.ident);
+        ret str::le(a.ident, b.ident);
     }
     ret std::sort::merge_sort(bind method_lteq(_, _), meths);
 }

branches/snap-stage3/src/libcore/str.rs

@@ -54,7 +54,7 @@ export
 
    // Comparing strings
    eq,
-   lteq,
+   le,
    hash,
 
    // Iterating through strings
@@ -704,11 +704,11 @@ Bytewise string equality
 pure fn eq(&&a: str, &&b: str) -> bool { a == b }
 
 /*
-Function: lteq
+Function: le
 
 Bytewise less than or equal
 */
-pure fn lteq(&&a: str, &&b: str) -> bool { a <= b }
+pure fn le(&&a: str, &&b: str) -> bool { a <= b }
 
 /*
 Function: hash
@@ -1381,10 +1381,10 @@ mod tests {
     }
 
     #[test]
-    fn test_lteq() {
-        assert (lteq("", ""));
-        assert (lteq("", "foo"));
-        assert (lteq("foo", "foo"));
+    fn test_le() {
+        assert (le("", ""));
+        assert (le("", "foo"));
+        assert (le("foo", "foo"));
         assert (!eq("foo", "bar"));
     }
 

branches/snap-stage3/src/libstd/test.rs

@@ -279,7 +279,7 @@ fn filter_tests(opts: test_opts,
     filtered =
         {
             fn lteq(t1: test_desc, t2: test_desc) -> bool {
-                str::lteq(t1.name, t2.name)
+                str::le(t1.name, t2.name)
             }
             sort::merge_sort(bind lteq(_, _), filtered)
         };

branches/snap-stage3/src/rustdoc/sort_pass.rs

@@ -38,7 +38,7 @@ fn fold_mod(
 #[test]
 fn test() {
     fn name_lteq(item1: doc::itemtag, item2: doc::itemtag) -> bool {
-        str::lteq(item1.name(), item2.name())
+        str::le(item1.name(), item2.name())
     }
 
     let source = "mod z { mod y { } fn x() { } } mod w { }";