Skip to content

Commit fb2f09e

Browse files
committed
---
yaml --- r: 172221 b: refs/heads/beta c: a8a210b h: refs/heads/master i: 172219: dae1b5f v: v3
1 parent 5cb642b commit fb2f09e

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 6342aa62efd1b3aa7e1bc8f834f317290b11c519
34+
refs/heads/beta: a8a210b57ef6b2f5f66b8798c80acfde70c9d2e7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/src/libcollections/string.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@ pub trait ToString {
932932
fn to_string(&self) -> String;
933933
}
934934

935-
impl<T: fmt::String> ToString for T {
935+
impl<T: fmt::String + ?Sized> ToString for T {
936936
fn to_string(&self) -> String {
937937
use core::fmt::Writer;
938938
let mut buf = String::new();
@@ -994,6 +994,12 @@ mod tests {
994994
assert_eq!(owned.as_ref().map(|s| s.as_slice()), Some("string"));
995995
}
996996

997+
#[test]
998+
fn test_unsized_to_string() {
999+
let s: &str = "abc";
1000+
let _: String = (*s).to_string();
1001+
}
1002+
9971003
#[test]
9981004
fn test_from_utf8() {
9991005
let xs = b"hello".to_vec();

branches/beta/src/libcollections/vec.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
//! let two = xs.pop();
4545
//! ```
4646
47+
#![stable]
48+
4749
use core::prelude::*;
4850

4951
use alloc::boxed::Box;

branches/beta/src/libcore/fmt/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
//! Utilities for formatting and printing strings
1212
1313
#![allow(unused_variables)]
14+
#![stable]
1415

1516
use any;
1617
use cell::{Cell, RefCell, Ref, RefMut};

branches/beta/src/libunicode/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ mod u_str;
5757
/// (inclusive) are allowed. A `char` can always be safely cast to a `u32`;
5858
/// however the converse is not always true due to the above range limits
5959
/// and, as such, should be performed via the `from_u32` function..
60+
#[stable]
6061
pub mod char {
6162
pub use core::char::{MAX, from_u32, from_digit};
6263

0 commit comments

Comments
 (0)