about summary refs log tree commit diff
path: root/src/libstd/comm/select.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-25 07:56:27 -0800
committerbors <bors@rust-lang.org>2014-01-25 07:56:27 -0800
commit0f637ebd0634f0c8a96a5567d9eab82fc5a181c7 (patch)
treee04711efa643d68c4ad3195fff43cdc9918cac6a /src/libstd/comm/select.rs
parentcaabbb8388e180ce585dbe1872ad1759d411aab6 (diff)
parent988e4f0a1c2802921375271bdc19f03650c024d2 (diff)
downloadrust-0f637ebd0634f0c8a96a5567d9eab82fc5a181c7.tar.gz
rust-0f637ebd0634f0c8a96a5567d9eab82fc5a181c7.zip
auto merge of #11790 : lfairy/rust/rename-num-consts, r=alexcrichton
The following are renamed:

* `min_value` => `MIN`
* `max_value` => `MAX`
* `bits` => `BITS`
* `bytes` => `BYTES`

All tests pass, except for `run-pass/phase-syntax-link-does-resolve.rs`. I doubt that failure is related, though.

Fixes #10010.
Diffstat (limited to 'src/libstd/comm/select.rs')
-rw-r--r--src/libstd/comm/select.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/comm/select.rs b/src/libstd/comm/select.rs
index 5aa8687a5bb..c9102a68435 100644
--- a/src/libstd/comm/select.rs
+++ b/src/libstd/comm/select.rs
@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -182,7 +182,7 @@ impl Select {
             assert!(amt > 0);
 
             let mut ready_index = amt;
-            let mut ready_id = uint::max_value;
+            let mut ready_id = uint::MAX;
             let mut iter = self.iter().enumerate();
 
             // Acquire a number of blocking contexts, and block on each one
@@ -245,7 +245,7 @@ impl Select {
                 assert!(!(*packet).selecting.load(Relaxed));
             }
 
-            assert!(ready_id != uint::max_value);
+            assert!(ready_id != uint::MAX);
             return ready_id;
         }
     }