Skip to content

Commit 6b1426b

Browse files
committed
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.
2 parents 7d76d0a + d12e12e commit 6b1426b

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/libstd/ascii.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -591,13 +591,10 @@ mod tests {
591591
fn test_ascii_vec() {
592592
let test = &[40u8, 32u8, 59u8];
593593
assert_eq!(test.to_ascii(), v2ascii!([40, 32, 59]));
594-
assert_eq!("( ;".to_ascii(), v2ascii!([40, 32, 59]));
595-
// FIXME: #5475 borrowchk error, owned vectors do not live long enough
596-
// if chained-from directly
594+
assert_eq!("( ;".to_ascii(), v2ascii!([40, 32, 59]));
597595
let v = box [40u8, 32u8, 59u8];
598596
assert_eq!(v.to_ascii(), v2ascii!([40, 32, 59]));
599-
let v = "( ;".to_strbuf();
600-
assert_eq!(v.as_slice().to_ascii(), v2ascii!([40, 32, 59]));
597+
assert_eq!("( ;".to_strbuf().as_slice().to_ascii(), v2ascii!([40, 32, 59]));
601598

602599
assert_eq!("abCDef&?#".to_ascii().to_lower().into_str(), "abcdef&?#".to_strbuf());
603600
assert_eq!("abCDef&?#".to_ascii().to_upper().into_str(), "ABCDEF&?#".to_strbuf());

0 commit comments

Comments
 (0)