From c99488b3a4045171e36bcd2a89e742ac06d3ba72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20L=C3=B6bel?= Date: Mon, 25 Mar 2013 02:49:42 +0100 Subject: [PATCH] Isolated bug, static vector seems to behave differently than fixed sized one --- src/libcore/str.rs | 30 ------------------------------ src/libstd/base64.rs | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/libcore/str.rs b/src/libcore/str.rs index 4fc960a7c04..96cadadfe89 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -994,7 +994,6 @@ pub fn eachi_reverse(s: &str, it: &fn(uint, u8) -> bool) { } } - /// Iterate over each char of a string, without allocating #[inline(always)] pub fn each_char(s: &str, it: &fn(char) -> bool) { @@ -1042,35 +1041,6 @@ pub fn each_chari_reverse(s: &str, it: &fn(uint, char) -> bool) { } } -///////////////////////////////////////////////////////////////////////////////////////////////// -// NOTE: Remove afterwards -/* /// Apply a function to each substring after splitting by character -pub fn split_char_each(ss: &str, cc: char, ff: &fn(v: &str) -> bool) { - vec::each(split_char(ss, cc), |s| ff(*s)) -} - -** - * Apply a function to each substring after splitting by character, up to - * `count` times - * -pub fn splitn_char_each(ss: &str, sep: char, count: uint, - ff: &fn(v: &str) -> bool) { - vec::each(splitn_char(ss, sep, count), |s| ff(*s)) -} - -/ Apply a function to each word -pub fn words_each(ss: &str, ff: &fn(v: &str) -> bool) { - vec::each(words(ss), |s| ff(*s)) -} - -** - * Apply a function to each line (by '\n') - * -pub fn lines_each(ss: &str, ff: &fn(v: &str) -> bool) { - vec::each(lines(ss), |s| ff(*s)) -} */ -///////////////////////////////////////////////////////////////////////////////////////////////// - /* Section: Searching */ diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs index b11ad7052b9..02858de9b34 100644 --- a/src/libstd/base64.rs +++ b/src/libstd/base64.rs @@ -16,7 +16,7 @@ pub trait ToBase64 { fn to_base64(&self) -> ~str; } -static CHARS: &'static[char] = &[ +static CHARS: [char * 64] = [ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',