diff options
| author | Brian Anderson <andersrb@gmail.com> | 2016-09-23 23:03:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 23:03:46 +0000 |
| commit | d3eb33ef8fb536f6b7aca2e8613027c54218554d (patch) | |
| tree | 6a8f374d2adc85df9bea0e8ead09cd5bed0a11d0 | |
| parent | aec83648f2d5a96e1779d75ecaa84b18349761dc (diff) | |
| parent | aaf78d886b0281d602943d37277a5e23289c6fab (diff) | |
Merge pull request #36686 from brson/beta-next
Beta next
| -rw-r--r-- | mk/main.mk | 2 | ||||
| -rw-r--r-- | src/libcollections/string.rs | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/mk/main.mk b/mk/main.mk index b85c7a5c581..90d3563240c 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.12.0 # An optional number to put after the label, e.g. '.2' -> '-beta.2' # NB Make sure it starts with a dot to conform to semver pre-release # versions (section 9) -CFG_PRERELEASE_VERSION=.5 +CFG_PRERELEASE_VERSION=.6 ifeq ($(CFG_RELEASE_CHANNEL),stable) # This is the normal semver version string, e.g. "0.12.0", "0.12.0-nightly" diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 788c838cd3f..1ba0319f2d7 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -1901,26 +1901,6 @@ impl Into<Vec<u8>> for String { } } -#[stable(feature = "stringfromchars", since = "1.12.0")] -impl<'a> From<&'a [char]> for String { - #[inline] - fn from(v: &'a [char]) -> String { - let mut s = String::with_capacity(v.len()); - for c in v { - s.push(*c); - } - s - } -} - -#[stable(feature = "stringfromchars", since = "1.12.0")] -impl From<Vec<char>> for String { - #[inline] - fn from(v: Vec<char>) -> String { - String::from(v.as_slice()) - } -} - #[stable(feature = "rust1", since = "1.0.0")] impl fmt::Write for String { #[inline] |