diff options
| author | bors <bors@rust-lang.org> | 2014-01-25 07:56:27 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-25 07:56:27 -0800 |
| commit | 0f637ebd0634f0c8a96a5567d9eab82fc5a181c7 (patch) | |
| tree | e04711efa643d68c4ad3195fff43cdc9918cac6a /src/libsyntax | |
| parent | caabbb8388e180ce585dbe1872ad1759d411aab6 (diff) | |
| parent | 988e4f0a1c2802921375271bdc19f03650c024d2 (diff) | |
| download | rust-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/libsyntax')
| -rw-r--r-- | src/libsyntax/ast_util.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 47ae146d19b..d3504f8d204 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -340,8 +340,8 @@ pub struct IdRange { impl IdRange { pub fn max() -> IdRange { IdRange { - min: u32::max_value, - max: u32::min_value, + min: u32::MAX, + max: u32::MIN, } } diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 22ece367b80..aa5e4e01ae0 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -1,4 +1,4 @@ -// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -78,7 +78,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> ~str { /// remove a "[ \t]*\*" block from each line, if possible fn horizontal_trim(lines: ~[~str]) -> ~[~str] { - let mut i = uint::max_value; + let mut i = uint::MAX; let mut can_trim = true; let mut first = true; for line in lines.iter() { |