diff options
| author | bors <bors@rust-lang.org> | 2014-05-24 21:51:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-24 21:51:18 -0700 |
| commit | 7d76d0ad44e1ec203d235f22eb3514247b8cbfe5 (patch) | |
| tree | 01682cf8147183250713acf5e8a77265aab7153c /src/libhexfloat | |
| parent | bbb70cdd9cd982922cf7390459d53bde409699ae (diff) | |
| parent | 553074506ecd139eb961fb91eb33ad9fd0183acb (diff) | |
| download | rust-7d76d0ad44e1ec203d235f22eb3514247b8cbfe5.tar.gz rust-7d76d0ad44e1ec203d235f22eb3514247b8cbfe5.zip | |
auto merge of #14323 : richo/rust/features/strbuf_to_string, r=huonw
Converts `StrBuf` to `String` throughout rustc and the standard library. Tests all pass locally, but usual caveats about platforms that aren't OSX apply since I don't have a test environment handy. @alexcritchon mentioned that @pcwalton may have a patch incoming that should block this? closes #14312
Diffstat (limited to 'src/libhexfloat')
| -rw-r--r-- | src/libhexfloat/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libhexfloat/lib.rs b/src/libhexfloat/lib.rs index 0e51d0a7770..8f0630bbb86 100644 --- a/src/libhexfloat/lib.rs +++ b/src/libhexfloat/lib.rs @@ -70,7 +70,7 @@ pub fn macro_registrar(register: |Name, SyntaxExtension|) { //Check if the literal is valid (as LLVM expects), //and return a descriptive error if not. -fn hex_float_lit_err(s: &str) -> Option<(uint, StrBuf)> { +fn hex_float_lit_err(s: &str) -> Option<(uint, String)> { let mut chars = s.chars().peekable(); let mut i = 0; if chars.peek() == Some(&'-') { chars.next(); i+= 1 } |
