about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-25 01:11:19 -0700
committerbors <bors@rust-lang.org>2014-05-25 01:11:19 -0700
commit6b1426b87c203c64dd4200eef0dd67ea5af29268 (patch)
tree164dc81fcd24e1568cf89087f8ac106ae94cabfa /src
parent7d76d0ad44e1ec203d235f22eb3514247b8cbfe5 (diff)
parentd12e12ed992f976d9e6b3b80e174240da4c5b5a6 (diff)
downloadrust-6b1426b87c203c64dd4200eef0dd67ea5af29268.tar.gz
rust-6b1426b87c203c64dd4200eef0dd67ea5af29268.zip
auto merge of #14415 : Sawyer47/rust/ascii-fixme, r=huonw
Issue #5475 was closed some time ago, but ascii.rs still contained
a FIXME for it.
Diffstat (limited to 'src')
-rw-r--r--src/libstd/ascii.rs7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index 61e3f1a14bb..d3b98b02bd0 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -591,13 +591,10 @@ mod tests {
     fn test_ascii_vec() {
         let test = &[40u8, 32u8, 59u8];
         assert_eq!(test.to_ascii(), v2ascii!([40, 32, 59]));
-        assert_eq!("( ;".to_ascii(),                 v2ascii!([40, 32, 59]));
-        // FIXME: #5475 borrowchk error, owned vectors do not live long enough
-        // if chained-from directly
+        assert_eq!("( ;".to_ascii(), v2ascii!([40, 32, 59]));
         let v = box [40u8, 32u8, 59u8];
         assert_eq!(v.to_ascii(), v2ascii!([40, 32, 59]));
-        let v = "( ;".to_strbuf();
-        assert_eq!(v.as_slice().to_ascii(), v2ascii!([40, 32, 59]));
+        assert_eq!("( ;".to_strbuf().as_slice().to_ascii(), v2ascii!([40, 32, 59]));
 
         assert_eq!("abCDef&?#".to_ascii().to_lower().into_str(), "abcdef&?#".to_strbuf());
         assert_eq!("abCDef&?#".to_ascii().to_upper().into_str(), "ABCDEF&?#".to_strbuf());