Skip to content

change String::from_str() to .to_string() #15519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/doc/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -1621,7 +1621,7 @@ let more_numbers: Vec<int> = numbers.move_iter().map(|i| i+1).collect();

// The original `numbers` value can no longer be used, due to move semantics.

let mut string = String::from_str("fo");
let mut string = "fo".to_string();
string.push_char('o');
~~~

Expand Down
2 changes: 1 addition & 1 deletion src/liballoc/rc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ struct Gadget {
fn main() {
// Create a reference counted Owner.
let gadget_owner : Rc<Owner> = Rc::new(
Owner { name: String::from_str("Gadget Man") }
Owner { name: "Gadget Man".to_string() }
);

// Create Gadgets belonging to gadget_owner. To increment the reference
Expand Down
22 changes: 11 additions & 11 deletions src/libcollections/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ mod tests {

#[test]
fn test_push_bytes() {
let mut s = String::from_str("ABC");
let mut s = "ABC".to_string();
unsafe {
s.push_bytes([ 'D' as u8 ]);
}
Expand All @@ -407,7 +407,7 @@ mod tests {

#[test]
fn test_push_char() {
let mut data = String::from_str("ประเทศไทย中");
let mut data = "ประเทศไทย中".to_string();
data.push_char('华');
data.push_char('b'); // 1 byte
data.push_char('¢'); // 2 byte
Expand All @@ -418,7 +418,7 @@ mod tests {

#[test]
fn test_pop_char() {
let mut data = String::from_str("ประเทศไทย中华b¢€𤭢");
let mut data = "ประเทศไทย中华b¢€𤭢".to_string();
assert_eq!(data.pop_char().unwrap(), '𤭢'); // 4 bytes
assert_eq!(data.pop_char().unwrap(), '€'); // 3 bytes
assert_eq!(data.pop_char().unwrap(), '¢'); // 2 bytes
Expand All @@ -429,7 +429,7 @@ mod tests {

#[test]
fn test_shift_char() {
let mut data = String::from_str("𤭢€¢b华ประเทศไทย中");
let mut data = "𤭢€¢b华ประเทศไทย中".to_string();
assert_eq!(data.shift_char().unwrap(), '𤭢'); // 4 bytes
assert_eq!(data.shift_char().unwrap(), '€'); // 3 bytes
assert_eq!(data.shift_char().unwrap(), '¢'); // 2 bytes
Expand All @@ -440,15 +440,15 @@ mod tests {

#[test]
fn test_str_truncate() {
let mut s = String::from_str("12345");
let mut s = "12345".to_string();
s.truncate(5);
assert_eq!(s.as_slice(), "12345");
s.truncate(3);
assert_eq!(s.as_slice(), "123");
s.truncate(0);
assert_eq!(s.as_slice(), "");

let mut s = String::from_str("12345");
let mut s = "12345".to_string();
let p = s.as_slice().as_ptr();
s.truncate(3);
s.push_str("6");
Expand All @@ -459,30 +459,30 @@ mod tests {
#[test]
#[should_fail]
fn test_str_truncate_invalid_len() {
let mut s = String::from_str("12345");
let mut s = "12345".to_string();
s.truncate(6);
}

#[test]
#[should_fail]
fn test_str_truncate_split_codepoint() {
let mut s = String::from_str("\u00FC"); // ü
let mut s = "\u00FC".to_string(); // ü
s.truncate(1);
}

#[test]
fn test_str_clear() {
let mut s = String::from_str("12345");
let mut s = "12345".to_string();
s.clear();
assert_eq!(s.len(), 0);
assert_eq!(s.as_slice(), "");
}

#[test]
fn test_str_add() {
let a = String::from_str("12345");
let a = "12345".to_string();
let b = a + "2";
let b = b + String::from_str("2");
let b = b + "2".to_string();
assert_eq!(b.len(), 7);
assert_eq!(b.as_slice(), "1234522");
}
Expand Down