---

thestinger · thestinger · commit 8372af2c5207 · 2013-03-02T16:30:42.000-05:00
yaml --- r: 48081 b: refs/heads/incoming c: 3550233 h: refs/heads/master i: 48079: c772c31 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: a4d22635e1453d77e90c4335f5c2e1f62e3185eb
+refs/heads/incoming: 3550233d37c4acc5c438dbd2bab62869484b54a9
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/cmp.rs b/branches/incoming/src/libcore/cmp.rs
@@ -45,6 +45,7 @@ pub trait TotalOrd {
     pure fn cmp(&self, other: &Self) -> Ordering;
 }
 
+#[inline(always)]
 pure fn icmp<T: Ord>(a: &T, b: &T) -> Ordering {
     if *a < *b { Less }
     else if *a > *b { Greater }
diff --git a/branches/incoming/src/libcore/core.rc b/branches/incoming/src/libcore/core.rc
@@ -144,7 +144,6 @@ pub mod dlist;
 pub mod dlist_iter;
 pub mod hashmap;
 pub mod cell;
-pub mod trie;
 
 
 /* Tasks and communication */
diff --git a/branches/incoming/src/libcore/trie.rs b/branches/incoming/src/libcore/trie.rs

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ pub trait TotalOrd {`
`45`	`45`	`pure fn cmp(&self, other: &Self) -> Ordering;`
`46`	`46`	`}`
`47`	`47`
	`48`	`+#[inline(always)]`
`48`	`49`	`pure fn icmp<T: Ord>(a: &T, b: &T) -> Ordering {`
`49`	`50`	`if a < b { Less }`
`50`	`51`	`else if a > b { Greater }`