From a0534229903e071dcb46f2cdd4dbc1e50b2c9950 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 10 Dec 2014 11:14:17 -0500 Subject: [PATCH 1/2] sed -i 's/".to_string()/".into_string()/g' src/lib*/**/*.rs :P --- src/liballoc/rc.rs | 2 +- src/libarena/lib.rs | 8 +- src/libcollections/hash/mod.rs | 8 +- src/libcollections/slice.rs | 2 +- src/libcollections/str.rs | 16 +- src/libcollections/string.rs | 28 +-- src/libcollections/tree/map.rs | 4 +- src/libcollections/vec.rs | 2 +- src/libcore/any.rs | 2 +- src/libcore/fmt/num.rs | 2 +- src/libcore/option.rs | 4 +- src/libcore/result.rs | 2 +- src/libcoretest/mem.rs | 4 +- src/libcoretest/option.rs | 4 +- src/libgetopts/lib.rs | 178 +++++++++--------- src/liblog/directive.rs | 26 +-- src/liblog/lib.rs | 22 +-- src/libregex/parse.rs | 4 +- src/librustc/lint/builtin.rs | 2 +- src/librustc/metadata/filesearch.rs | 10 +- src/librustc/middle/borrowck/check_loans.rs | 2 +- src/librustc/middle/borrowck/graphviz.rs | 4 +- src/librustc/middle/borrowck/mod.rs | 2 +- src/librustc/middle/const_eval.rs | 38 ++-- src/librustc/middle/dataflow.rs | 4 +- src/librustc/middle/infer/equate.rs | 2 +- src/librustc/middle/infer/error_reporting.rs | 12 +- src/librustc/middle/infer/glb.rs | 2 +- src/librustc/middle/infer/lub.rs | 2 +- src/librustc/middle/infer/mod.rs | 8 +- src/librustc/middle/infer/sub.rs | 2 +- src/librustc/middle/liveness.rs | 6 +- src/librustc/middle/mem_categorization.rs | 20 +- src/librustc/middle/resolve.rs | 24 +-- src/librustc/middle/ty.rs | 62 +++--- src/librustc/session/config.rs | 20 +- src/librustc/util/ppaux.rs | 52 ++--- src/librustc_back/arm.rs | 18 +- src/librustc_back/mips.rs | 14 +- src/librustc_back/mipsel.rs | 14 +- src/librustc_back/rpath.rs | 30 +-- src/librustc_back/sha2.rs | 12 +- src/librustc_back/target/apple_base.rs | 6 +- src/librustc_back/target/arm_apple_ios.rs | 14 +- .../target/arm_linux_androideabi.rs | 16 +- .../target/arm_unknown_linux_gnueabi.rs | 14 +- .../target/arm_unknown_linux_gnueabihf.rs | 14 +- src/librustc_back/target/dragonfly_base.rs | 8 +- src/librustc_back/target/freebsd_base.rs | 8 +- src/librustc_back/target/i386_apple_ios.rs | 12 +- src/librustc_back/target/i686_apple_darwin.rs | 14 +- .../target/i686_pc_windows_gnu.rs | 16 +- .../target/i686_unknown_dragonfly.rs | 14 +- .../target/i686_unknown_linux_gnu.rs | 14 +- src/librustc_back/target/linux_base.rs | 4 +- .../target/mips_unknown_linux_gnu.rs | 12 +- .../target/mipsel_unknown_linux_gnu.rs | 12 +- src/librustc_back/target/mod.rs | 20 +- src/librustc_back/target/windows_base.rs | 18 +- .../target/x86_64_apple_darwin.rs | 14 +- .../target/x86_64_pc_windows_gnu.rs | 16 +- .../target/x86_64_unknown_dragonfly.rs | 12 +- .../target/x86_64_unknown_freebsd.rs | 14 +- .../target/x86_64_unknown_linux_gnu.rs | 14 +- src/librustc_back/x86.rs | 18 +- src/librustc_back/x86_64.rs | 18 +- src/librustc_driver/driver.rs | 8 +- src/librustc_driver/lib.rs | 8 +- src/librustc_trans/back/link.rs | 2 +- src/librustc_trans/back/write.rs | 4 +- src/librustc_trans/save/mod.rs | 4 +- src/librustc_trans/save/recorder.rs | 2 +- src/librustc_trans/trans/asm.rs | 4 +- src/librustc_trans/trans/base.rs | 10 +- src/librustc_trans/trans/callee.rs | 2 +- src/librustc_trans/trans/debuginfo.rs | 48 ++--- src/librustc_trans/trans/expr.rs | 2 +- src/librustc_trans/trans/foreign.rs | 2 +- src/librustc_trans/trans/type_of.rs | 2 +- src/librustc_typeck/check/_match.rs | 2 +- src/librustc_typeck/check/mod.rs | 6 +- src/librustdoc/clean/inline.rs | 2 +- src/librustdoc/clean/mod.rs | 24 +-- src/librustdoc/html/format.rs | 14 +- src/librustdoc/html/highlight.rs | 2 +- src/librustdoc/html/layout.rs | 6 +- src/librustdoc/html/markdown.rs | 2 +- src/librustdoc/html/render.rs | 10 +- src/librustdoc/html/toc.rs | 4 +- src/librustdoc/lib.rs | 24 +-- src/librustdoc/markdown.rs | 4 +- src/librustdoc/passes.rs | 14 +- src/librustdoc/stability_summary.rs | 2 +- src/librustdoc/test.rs | 2 +- src/librustrt/c_str.rs | 2 +- src/libserialize/json.rs | 12 +- src/libstd/ascii.rs | 18 +- src/libstd/collections/hash/map.rs | 6 +- src/libstd/collections/hash/set.rs | 4 +- src/libstd/collections/lru_cache.rs | 20 +- src/libstd/fmt.rs | 2 +- src/libstd/hash.rs | 8 +- src/libstd/io/buffered.rs | 12 +- src/libstd/io/comm_adapters.rs | 4 +- src/libstd/io/process.rs | 2 +- src/libstd/io/util.rs | 8 +- src/libstd/os.rs | 12 +- src/libstd/path/posix.rs | 4 +- src/libstd/path/windows.rs | 4 +- src/libstd/sync/future.rs | 12 +- src/libstd/task.rs | 6 +- src/libsyntax/ast_util.rs | 4 +- src/libsyntax/codemap.rs | 36 ++-- src/libsyntax/diagnostic.rs | 2 +- src/libsyntax/diagnostics/plugin.rs | 2 +- src/libsyntax/ext/asm.rs | 2 +- src/libsyntax/ext/deriving/generic/mod.rs | 2 +- src/libsyntax/ext/expand.rs | 30 +-- src/libsyntax/ext/format.rs | 4 +- src/libsyntax/ext/quote.rs | 12 +- src/libsyntax/ext/tt/macro_parser.rs | 4 +- src/libsyntax/ext/tt/macro_rules.rs | 2 +- src/libsyntax/fold.rs | 8 +- src/libsyntax/parse/lexer/comments.rs | 2 +- src/libsyntax/parse/lexer/mod.rs | 34 ++-- src/libsyntax/parse/mod.rs | 34 ++-- src/libsyntax/print/pp.rs | 8 +- src/libsyntax/test.rs | 4 +- src/libsyntax/util/parser_testing.rs | 4 +- src/libterm/terminfo/mod.rs | 2 +- src/libterm/terminfo/parm.rs | 112 +++++------ src/libterm/terminfo/parser/compiled.rs | 22 +-- src/libtest/lib.rs | 94 ++++----- src/libtest/stats.rs | 6 +- src/libtime/lib.rs | 76 ++++---- 135 files changed, 930 insertions(+), 930 deletions(-) diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 217c898e661a0..c9b8fc55f51a1 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -107,7 +107,7 @@ //! // through a shared reference. //! let gadget_owner : Rc = Rc::new( //! Owner { -//! name: "Gadget Man".to_string(), +//! name: "Gadget Man".into_string(), //! gadgets: RefCell::new(Vec::new()) //! } //! ); diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs index 95c4dff323ef0..c2d5c60a660d4 100644 --- a/src/libarena/lib.rs +++ b/src/libarena/lib.rs @@ -577,7 +577,7 @@ mod tests { let arena = TypedArena::new(); for _ in range(0u, 100000) { arena.alloc(Noncopy { - string: "hello world".to_string(), + string: "hello world".into_string(), array: vec!( 1, 2, 3, 4, 5 ), }); } @@ -588,7 +588,7 @@ mod tests { let arena = TypedArena::new(); b.iter(|| { arena.alloc(Noncopy { - string: "hello world".to_string(), + string: "hello world".into_string(), array: vec!( 1, 2, 3, 4, 5 ), }) }) @@ -598,7 +598,7 @@ mod tests { pub fn bench_noncopy_nonarena(b: &mut Bencher) { b.iter(|| { box Noncopy { - string: "hello world".to_string(), + string: "hello world".into_string(), array: vec!( 1, 2, 3, 4, 5 ), } }) @@ -609,7 +609,7 @@ mod tests { let arena = Arena::new(); b.iter(|| { arena.alloc(|| Noncopy { - string: "hello world".to_string(), + string: "hello world".into_string(), array: vec!( 1, 2, 3, 4, 5 ), }) }) diff --git a/src/libcollections/hash/mod.rs b/src/libcollections/hash/mod.rs index 637541a8fd654..2fd770970370a 100644 --- a/src/libcollections/hash/mod.rs +++ b/src/libcollections/hash/mod.rs @@ -26,8 +26,8 @@ //! phone: u64, //! } //! -//! let person1 = Person { id: 5, name: "Janet".to_string(), phone: 555_666_7777 }; -//! let person2 = Person { id: 5, name: "Bob".to_string(), phone: 555_666_7777 }; +//! let person1 = Person { id: 5, name: "Janet".into_string(), phone: 555_666_7777 }; +//! let person2 = Person { id: 5, name: "Bob".into_string(), phone: 555_666_7777 }; //! //! assert!(hash::hash(&person1) != hash::hash(&person2)); //! ``` @@ -53,8 +53,8 @@ //! } //! } //! -//! let person1 = Person { id: 5, name: "Janet".to_string(), phone: 555_666_7777 }; -//! let person2 = Person { id: 5, name: "Bob".to_string(), phone: 555_666_7777 }; +//! let person1 = Person { id: 5, name: "Janet".into_string(), phone: 555_666_7777 }; +//! let person2 = Person { id: 5, name: "Bob".into_string(), phone: 555_666_7777 }; //! //! assert!(hash::hash(&person1) == hash::hash(&person2)); //! ``` diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs index 6bdfa490748fa..cd812d3604236 100644 --- a/src/libcollections/slice.rs +++ b/src/libcollections/slice.rs @@ -1121,7 +1121,7 @@ mod tests { assert_eq!(it.next(), None); } { - let v = ["Hello".to_string()]; + let v = ["Hello".into_string()]; let mut it = v.permutations(); let (min_size, max_opt) = it.size_hint(); assert_eq!(min_size, 1); diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index b4e479b132d21..5df3544069e34 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -96,10 +96,10 @@ pub trait StrVector for Sized? { /// # Examples /// /// ```rust - /// let first = "Restaurant at the End of the".to_string(); - /// let second = " Universe".to_string(); + /// let first = "Restaurant at the End of the".into_string(); + /// let second = " Universe".into_string(); /// let string_vec = vec![first, second]; - /// assert_eq!(string_vec.concat(), "Restaurant at the End of the Universe".to_string()); + /// assert_eq!(string_vec.concat(), "Restaurant at the End of the Universe".into_string()); /// ``` fn concat(&self) -> String; @@ -108,10 +108,10 @@ pub trait StrVector for Sized? { /// # Examples /// /// ```rust - /// let first = "Roast".to_string(); - /// let second = "Sirloin Steak".to_string(); + /// let first = "Roast".into_string(); + /// let second = "Sirloin Steak".into_string(); /// let string_vec = vec![first, second]; - /// assert_eq!(string_vec.connect(", "), "Roast, Sirloin Steak".to_string()); + /// assert_eq!(string_vec.connect(", "), "Roast, Sirloin Steak".into_string()); /// ``` fn connect(&self, sep: &str) -> String; } @@ -720,11 +720,11 @@ pub trait StrAllocating: Str { /// /// ```rust /// let s = "Do you know the muffin man, - /// The muffin man, the muffin man, ...".to_string(); + /// The muffin man, the muffin man, ...".into_string(); /// /// assert_eq!(s.replace("muffin man", "little lamb"), /// "Do you know the little lamb, - /// The little lamb, the little lamb, ...".to_string()); + /// The little lamb, the little lamb, ...".into_string()); /// /// // not found, so no change. /// assert_eq!(s.replace("cookie monster", "little lamb"), s); diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index d364f23761caa..ac5fa1ea50c75 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -94,7 +94,7 @@ impl String { /// ```rust /// let hello_vec = vec![104, 101, 108, 108, 111]; /// let s = String::from_utf8(hello_vec); - /// assert_eq!(s, Ok("hello".to_string())); + /// assert_eq!(s, Ok("hello".into_string())); /// /// let invalid_vec = vec![240, 144, 128]; /// let s = String::from_utf8(invalid_vec); @@ -246,7 +246,7 @@ impl String { /// // 𝄞music /// let mut v = &mut [0xD834, 0xDD1E, 0x006d, 0x0075, /// 0x0073, 0x0069, 0x0063]; - /// assert_eq!(String::from_utf16(v), Some("𝄞music".to_string())); + /// assert_eq!(String::from_utf16(v), Some("𝄞music".into_string())); /// /// // 𝄞muic /// v[4] = 0xD800; @@ -276,7 +276,7 @@ impl String { /// 0xD834]; /// /// assert_eq!(String::from_utf16_lossy(v), - /// "𝄞mus\uFFFDic\uFFFD".to_string()); + /// "𝄞mus\uFFFDic\uFFFD".into_string()); /// ``` #[stable] pub fn from_utf16_lossy(v: &[u16]) -> String { @@ -686,7 +686,7 @@ impl String { /// # Examples /// /// ``` - /// let a = "foo".to_string(); + /// let a = "foo".into_string(); /// assert_eq!(a.len(), 3); /// ``` #[inline] @@ -710,7 +710,7 @@ impl String { /// # Examples /// /// ``` - /// let mut s = "foo".to_string(); + /// let mut s = "foo".into_string(); /// s.clear(); /// assert!(s.is_empty()); /// ``` @@ -911,7 +911,7 @@ impl<'a> Deref for DerefString<'a> { /// use std::string::as_string; /// /// fn string_consumer(s: String) { -/// assert_eq!(s, "foo".to_string()); +/// assert_eq!(s, "foo".into_string()); /// } /// /// let string = as_string("foo").clone(); @@ -1286,7 +1286,7 @@ mod tests { #[test] fn remove() { - let mut s = "ศไทย中华Việt Nam; foobar".to_string();; + let mut s = "ศไทย中华Việt Nam; foobar".into_string();; assert_eq!(s.remove(0), Some('ศ')); assert_eq!(s.len(), 33); assert_eq!(s, "ไทย中华Việt Nam; foobar"); @@ -1298,24 +1298,24 @@ mod tests { #[test] #[should_fail] fn remove_bad() { - "ศ".to_string().remove(1); + "ศ".into_string().remove(1); } #[test] fn insert() { - let mut s = "foobar".to_string(); + let mut s = "foobar".into_string(); s.insert(0, 'ệ'); assert_eq!(s, "ệfoobar"); s.insert(6, 'ย'); assert_eq!(s, "ệfooยbar"); } - #[test] #[should_fail] fn insert_bad1() { "".to_string().insert(1, 't'); } - #[test] #[should_fail] fn insert_bad2() { "ệ".to_string().insert(1, 't'); } + #[test] #[should_fail] fn insert_bad1() { "".into_string().insert(1, 't'); } + #[test] #[should_fail] fn insert_bad2() { "ệ".into_string().insert(1, 't'); } #[test] fn test_slicing() { - let s = "foobar".to_string(); + let s = "foobar".into_string(); assert_eq!("foobar", s[]); assert_eq!("foo", s[..3]); assert_eq!("bar", s[3..]); @@ -1331,7 +1331,7 @@ mod tests { assert_eq!(true.to_string(), "true"); assert_eq!(false.to_string(), "false"); assert_eq!(().to_string(), "()"); - assert_eq!(("hi".to_string()).to_string(), "hi"); + assert_eq!(("hi".into_string()).to_string(), "hi"); } #[test] @@ -1346,7 +1346,7 @@ mod tests { #[test] fn test_from_iterator() { - let s = "ศไทย中华Việt Nam".to_string(); + let s = "ศไทย中华Việt Nam".into_string(); let t = "ศไทย中华"; let u = "Việt Nam"; diff --git a/src/libcollections/tree/map.rs b/src/libcollections/tree/map.rs index 24395ca64939c..fd5288010d9b5 100644 --- a/src/libcollections/tree/map.rs +++ b/src/libcollections/tree/map.rs @@ -597,8 +597,8 @@ impl TreeMap { /// /// fn get_headers() -> TreeMap { /// let mut result = TreeMap::new(); - /// result.insert("Content-Type".to_string(), "application/xml".to_string()); - /// result.insert("User-Agent".to_string(), "Curl-Rust/0.1".to_string()); + /// result.insert("Content-Type".into_string(), "application/xml".into_string()); + /// result.insert("User-Agent".into_string(), "Curl-Rust/0.1".into_string()); /// result /// } /// diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index a575d1f4bd294..a91135a562e73 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -827,7 +827,7 @@ impl Vec { /// # Examples /// /// ``` - /// let v = vec!["a".to_string(), "b".to_string()]; + /// let v = vec!["a".into_string(), "b".into_string()]; /// for s in v.into_iter() { /// // s has type String, not &String /// println!("{}", s); diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 75feb4d88289e..1092e568dc66b 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -61,7 +61,7 @@ //! } //! //! fn main() { -//! let my_string = "Hello World".to_string(); +//! let my_string = "Hello World".into_string(); //! do_work(&my_string); //! //! let my_i8: i8 = 100; diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs index fa6f48326b56b..1074265912a96 100644 --- a/src/libcore/fmt/num.rs +++ b/src/libcore/fmt/num.rs @@ -147,7 +147,7 @@ impl Copy for RadixFmt where T: Copy, R: Copy {} /// /// ``` /// use std::fmt::radix; -/// assert_eq!(format!("{}", radix(55i, 36)), "1j".to_string()); +/// assert_eq!(format!("{}", radix(55i, 36)), "1j".into_string()); /// ``` #[unstable = "may be renamed or move to a different module"] pub fn radix(x: T, base: u8) -> RadixFmt { diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 0697dfbb0f2e4..f56527585e100 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -236,7 +236,7 @@ impl Option { /// to the value inside the original. /// /// ``` - /// let num_as_str: Option = Some("10".to_string()); + /// let num_as_str: Option = Some("10".into_string()); /// // First, cast `Option` to `Option<&String>` with `as_ref`, /// // then consume *that* with `map`, leaving `num_as_str` on the stack. /// let num_as_int: Option = num_as_str.as_ref().map(|n| n.len()); @@ -410,7 +410,7 @@ impl Option { /// Convert an `Option` into an `Option`, consuming the original: /// /// ``` - /// let num_as_str: Option = Some("10".to_string()); + /// let num_as_str: Option = Some("10".into_string()); /// // `Option::map` takes self *by value*, consuming `num_as_str` /// let num_as_int: Option = num_as_str.map(|n| n.len()); /// ``` diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 8125afee13f58..76bfa7c65f6cd 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -488,7 +488,7 @@ impl Result { /// assert_eq!(x.map_err(stringify), Ok(2u)); /// /// let x: Result = Err(13); - /// assert_eq!(x.map_err(stringify), Err("error code: 13".to_string())); + /// assert_eq!(x.map_err(stringify), Err("error code: 13".into_string())); /// ``` #[inline] #[unstable = "waiting for unboxed closures"] diff --git a/src/libcoretest/mem.rs b/src/libcoretest/mem.rs index 75ddfd5413b31..6ff1bc4ba94e6 100644 --- a/src/libcoretest/mem.rs +++ b/src/libcoretest/mem.rs @@ -85,7 +85,7 @@ fn test_swap() { #[test] fn test_replace() { - let mut x = Some("test".to_string()); + let mut x = Some("test".into_string()); let y = replace(&mut x, None); assert!(x.is_none()); assert!(y.is_some()); @@ -109,7 +109,7 @@ fn test_transmute() { } unsafe { - assert!(vec![76u8] == transmute::<_, Vec>("L".to_string())); + assert!(vec![76u8] == transmute::<_, Vec>("L".into_string())); } } diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs index 86fc25c9d918c..2946f20432aa4 100644 --- a/src/libcoretest/option.rs +++ b/src/libcoretest/option.rs @@ -27,7 +27,7 @@ fn test_get_ptr() { #[test] fn test_get_str() { - let x = "test".to_string(); + let x = "test".into_string(); let addr_x = x.as_ptr(); let opt = Some(x); let y = opt.unwrap(); @@ -134,7 +134,7 @@ fn test_or_else() { #[test] fn test_unwrap() { assert_eq!(Some(1i).unwrap(), 1); - let s = Some("hello".to_string()).unwrap(); + let s = Some("hello".into_string()).unwrap(); assert_eq!(s, "hello"); } diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 9174f8e8456f3..a3d6d71766757 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -457,7 +457,7 @@ pub fn optflag(short_name: &str, long_name: &str, desc: &str) -> OptGroup { OptGroup { short_name: short_name.to_string(), long_name: long_name.to_string(), - hint: "".to_string(), + hint: "".into_string(), desc: desc.to_string(), hasarg: No, occur: Optional @@ -476,7 +476,7 @@ pub fn optflagmulti(short_name: &str, long_name: &str, desc: &str) -> OptGroup { OptGroup { short_name: short_name.to_string(), long_name: long_name.to_string(), - hint: "".to_string(), + hint: "".into_string(), desc: desc.to_string(), hasarg: No, occur: Multi @@ -955,14 +955,14 @@ fn test_split_within() { } t("", 0, &[]); t("", 15, &[]); - t("hello", 15, &["hello".to_string()]); + t("hello", 15, &["hello".into_string()]); t("\nMary had a little lamb\nLittle lamb\n", 15, &[ - "Mary had a".to_string(), - "little lamb".to_string(), - "Little lamb".to_string() + "Mary had a".into_string(), + "little lamb".into_string(), + "Little lamb".into_string() ]); t("\nMary had a little lamb\nLittle lamb\n", ::std::uint::MAX, - &["Mary had a little lamb\nLittle lamb".to_string()]); + &["Mary had a little lamb\nLittle lamb".into_string()]); } #[cfg(test)] @@ -976,7 +976,7 @@ mod tests { // Tests for reqopt #[test] fn test_reqopt() { - let long_args = vec!("--test=20".to_string()); + let long_args = vec!("--test=20".into_string()); let opts = vec!(reqopt("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { @@ -988,7 +988,7 @@ mod tests { } _ => { panic!("test_reqopt failed (long arg)"); } } - let short_args = vec!("-t".to_string(), "20".to_string()); + let short_args = vec!("-t".into_string(), "20".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Ok(ref m) => { assert!((m.opt_present("test"))); @@ -1002,7 +1002,7 @@ mod tests { #[test] fn test_reqopt_missing() { - let args = vec!("blah".to_string()); + let args = vec!("blah".into_string()); let opts = vec!(reqopt("t", "test", "testing", "TEST")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1013,14 +1013,14 @@ mod tests { #[test] fn test_reqopt_no_arg() { - let long_args = vec!("--test".to_string()); + let long_args = vec!("--test".into_string()); let opts = vec!(reqopt("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { Err(ArgumentMissing(_)) => {}, _ => panic!() } - let short_args = vec!("-t".to_string()); + let short_args = vec!("-t".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Err(ArgumentMissing(_)) => {}, _ => panic!() @@ -1029,7 +1029,7 @@ mod tests { #[test] fn test_reqopt_multi() { - let args = vec!("--test=20".to_string(), "-t".to_string(), "30".to_string()); + let args = vec!("--test=20".into_string(), "-t".into_string(), "30".into_string()); let opts = vec!(reqopt("t", "test", "testing", "TEST")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1041,7 +1041,7 @@ mod tests { // Tests for optopt #[test] fn test_optopt() { - let long_args = vec!("--test=20".to_string()); + let long_args = vec!("--test=20".into_string()); let opts = vec!(optopt("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { @@ -1053,7 +1053,7 @@ mod tests { } _ => panic!() } - let short_args = vec!("-t".to_string(), "20".to_string()); + let short_args = vec!("-t".into_string(), "20".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Ok(ref m) => { assert!((m.opt_present("test"))); @@ -1067,7 +1067,7 @@ mod tests { #[test] fn test_optopt_missing() { - let args = vec!("blah".to_string()); + let args = vec!("blah".into_string()); let opts = vec!(optopt("t", "test", "testing", "TEST")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1081,14 +1081,14 @@ mod tests { #[test] fn test_optopt_no_arg() { - let long_args = vec!("--test".to_string()); + let long_args = vec!("--test".into_string()); let opts = vec!(optopt("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { Err(ArgumentMissing(_)) => {}, _ => panic!() } - let short_args = vec!("-t".to_string()); + let short_args = vec!("-t".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Err(ArgumentMissing(_)) => {}, _ => panic!() @@ -1097,7 +1097,7 @@ mod tests { #[test] fn test_optopt_multi() { - let args = vec!("--test=20".to_string(), "-t".to_string(), "30".to_string()); + let args = vec!("--test=20".into_string(), "-t".into_string(), "30".into_string()); let opts = vec!(optopt("t", "test", "testing", "TEST")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1109,7 +1109,7 @@ mod tests { // Tests for optflag #[test] fn test_optflag() { - let long_args = vec!("--test".to_string()); + let long_args = vec!("--test".into_string()); let opts = vec!(optflag("t", "test", "testing")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { @@ -1119,7 +1119,7 @@ mod tests { } _ => panic!() } - let short_args = vec!("-t".to_string()); + let short_args = vec!("-t".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Ok(ref m) => { assert!(m.opt_present("test")); @@ -1131,7 +1131,7 @@ mod tests { #[test] fn test_optflag_missing() { - let args = vec!("blah".to_string()); + let args = vec!("blah".into_string()); let opts = vec!(optflag("t", "test", "testing")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1145,7 +1145,7 @@ mod tests { #[test] fn test_optflag_long_arg() { - let args = vec!("--test=20".to_string()); + let args = vec!("--test=20".into_string()); let opts = vec!(optflag("t", "test", "testing")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1156,7 +1156,7 @@ mod tests { #[test] fn test_optflag_multi() { - let args = vec!("--test".to_string(), "-t".to_string()); + let args = vec!("--test".into_string(), "-t".into_string()); let opts = vec!(optflag("t", "test", "testing")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1167,7 +1167,7 @@ mod tests { #[test] fn test_optflag_short_arg() { - let args = vec!("-t".to_string(), "20".to_string()); + let args = vec!("-t".into_string(), "20".into_string()); let opts = vec!(optflag("t", "test", "testing")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1183,7 +1183,7 @@ mod tests { // Tests for optflagmulti #[test] fn test_optflagmulti_short1() { - let args = vec!("-v".to_string()); + let args = vec!("-v".into_string()); let opts = vec!(optflagmulti("v", "verbose", "verbosity")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1196,7 +1196,7 @@ mod tests { #[test] fn test_optflagmulti_short2a() { - let args = vec!("-v".to_string(), "-v".to_string()); + let args = vec!("-v".into_string(), "-v".into_string()); let opts = vec!(optflagmulti("v", "verbose", "verbosity")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1209,7 +1209,7 @@ mod tests { #[test] fn test_optflagmulti_short2b() { - let args = vec!("-vv".to_string()); + let args = vec!("-vv".into_string()); let opts = vec!(optflagmulti("v", "verbose", "verbosity")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1222,7 +1222,7 @@ mod tests { #[test] fn test_optflagmulti_long1() { - let args = vec!("--verbose".to_string()); + let args = vec!("--verbose".into_string()); let opts = vec!(optflagmulti("v", "verbose", "verbosity")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1235,7 +1235,7 @@ mod tests { #[test] fn test_optflagmulti_long2() { - let args = vec!("--verbose".to_string(), "--verbose".to_string()); + let args = vec!("--verbose".into_string(), "--verbose".into_string()); let opts = vec!(optflagmulti("v", "verbose", "verbosity")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1248,8 +1248,8 @@ mod tests { #[test] fn test_optflagmulti_mix() { - let args = vec!("--verbose".to_string(), "-v".to_string(), - "-vv".to_string(), "verbose".to_string()); + let args = vec!("--verbose".into_string(), "-v".into_string(), + "-vv".into_string(), "verbose".into_string()); let opts = vec!(optflagmulti("v", "verbose", "verbosity")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1264,7 +1264,7 @@ mod tests { // Tests for optmulti #[test] fn test_optmulti() { - let long_args = vec!("--test=20".to_string()); + let long_args = vec!("--test=20".into_string()); let opts = vec!(optmulti("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { @@ -1276,7 +1276,7 @@ mod tests { } _ => panic!() } - let short_args = vec!("-t".to_string(), "20".to_string()); + let short_args = vec!("-t".into_string(), "20".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Ok(ref m) => { assert!((m.opt_present("test"))); @@ -1290,7 +1290,7 @@ mod tests { #[test] fn test_optmulti_missing() { - let args = vec!("blah".to_string()); + let args = vec!("blah".into_string()); let opts = vec!(optmulti("t", "test", "testing", "TEST")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1304,14 +1304,14 @@ mod tests { #[test] fn test_optmulti_no_arg() { - let long_args = vec!("--test".to_string()); + let long_args = vec!("--test".into_string()); let opts = vec!(optmulti("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { Err(ArgumentMissing(_)) => {}, _ => panic!() } - let short_args = vec!("-t".to_string()); + let short_args = vec!("-t".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Err(ArgumentMissing(_)) => {}, _ => panic!() @@ -1320,7 +1320,7 @@ mod tests { #[test] fn test_optmulti_multi() { - let args = vec!("--test=20".to_string(), "-t".to_string(), "30".to_string()); + let args = vec!("--test=20".into_string(), "-t".into_string(), "30".into_string()); let opts = vec!(optmulti("t", "test", "testing", "TEST")); let rs = getopts(args.as_slice(), opts.as_slice()); match rs { @@ -1339,14 +1339,14 @@ mod tests { #[test] fn test_unrecognized_option() { - let long_args = vec!("--untest".to_string()); + let long_args = vec!("--untest".into_string()); let opts = vec!(optmulti("t", "test", "testing", "TEST")); let rs = getopts(long_args.as_slice(), opts.as_slice()); match rs { Err(UnrecognizedOption(_)) => {}, _ => panic!() } - let short_args = vec!("-u".to_string()); + let short_args = vec!("-u".into_string()); match getopts(short_args.as_slice(), opts.as_slice()) { Err(UnrecognizedOption(_)) => {}, _ => panic!() @@ -1356,22 +1356,22 @@ mod tests { #[test] fn test_combined() { let args = - vec!("prog".to_string(), - "free1".to_string(), - "-s".to_string(), - "20".to_string(), - "free2".to_string(), - "--flag".to_string(), - "--long=30".to_string(), - "-f".to_string(), - "-m".to_string(), - "40".to_string(), - "-m".to_string(), - "50".to_string(), - "-n".to_string(), - "-A B".to_string(), - "-n".to_string(), - "-60 70".to_string()); + vec!("prog".into_string(), + "free1".into_string(), + "-s".into_string(), + "20".into_string(), + "free2".into_string(), + "--flag".into_string(), + "--long=30".into_string(), + "-f".into_string(), + "-m".into_string(), + "40".into_string(), + "-m".into_string(), + "50".into_string(), + "-n".into_string(), + "-A B".into_string(), + "-n".into_string(), + "-60 70".into_string()); let opts = vec!(optopt("s", "something", "something", "SOMETHING"), optflag("", "flag", "a flag"), @@ -1408,83 +1408,83 @@ mod tests { optopt("", "encrypt", "encrypt", "ENCRYPT"), optopt("f", "", "flag", "FLAG")); - let args_single = vec!("-e".to_string(), "foo".to_string()); + let args_single = vec!("-e".into_string(), "foo".into_string()); let matches_single = &match getopts(args_single.as_slice(), opts.as_slice()) { result::Result::Ok(m) => m, result::Result::Err(_) => panic!() }; - assert!(matches_single.opts_present(&["e".to_string()])); - assert!(matches_single.opts_present(&["encrypt".to_string(), "e".to_string()])); - assert!(matches_single.opts_present(&["e".to_string(), "encrypt".to_string()])); - assert!(!matches_single.opts_present(&["encrypt".to_string()])); - assert!(!matches_single.opts_present(&["thing".to_string()])); + assert!(matches_single.opts_present(&["e".into_string()])); + assert!(matches_single.opts_present(&["encrypt".into_string(), "e".into_string()])); + assert!(matches_single.opts_present(&["e".into_string(), "encrypt".into_string()])); + assert!(!matches_single.opts_present(&["encrypt".into_string()])); + assert!(!matches_single.opts_present(&["thing".into_string()])); assert!(!matches_single.opts_present(&[])); - assert_eq!(matches_single.opts_str(&["e".to_string()]).unwrap(), "foo"); - assert_eq!(matches_single.opts_str(&["e".to_string(), "encrypt".to_string()]).unwrap(), + assert_eq!(matches_single.opts_str(&["e".into_string()]).unwrap(), "foo"); + assert_eq!(matches_single.opts_str(&["e".into_string(), "encrypt".into_string()]).unwrap(), "foo"); - assert_eq!(matches_single.opts_str(&["encrypt".to_string(), "e".to_string()]).unwrap(), + assert_eq!(matches_single.opts_str(&["encrypt".into_string(), "e".into_string()]).unwrap(), "foo"); - let args_both = vec!("-e".to_string(), "foo".to_string(), "--encrypt".to_string(), - "foo".to_string()); + let args_both = vec!("-e".into_string(), "foo".into_string(), "--encrypt".into_string(), + "foo".into_string()); let matches_both = &match getopts(args_both.as_slice(), opts.as_slice()) { result::Result::Ok(m) => m, result::Result::Err(_) => panic!() }; - assert!(matches_both.opts_present(&["e".to_string()])); - assert!(matches_both.opts_present(&["encrypt".to_string()])); - assert!(matches_both.opts_present(&["encrypt".to_string(), "e".to_string()])); - assert!(matches_both.opts_present(&["e".to_string(), "encrypt".to_string()])); - assert!(!matches_both.opts_present(&["f".to_string()])); - assert!(!matches_both.opts_present(&["thing".to_string()])); + assert!(matches_both.opts_present(&["e".into_string()])); + assert!(matches_both.opts_present(&["encrypt".into_string()])); + assert!(matches_both.opts_present(&["encrypt".into_string(), "e".into_string()])); + assert!(matches_both.opts_present(&["e".into_string(), "encrypt".into_string()])); + assert!(!matches_both.opts_present(&["f".into_string()])); + assert!(!matches_both.opts_present(&["thing".into_string()])); assert!(!matches_both.opts_present(&[])); - assert_eq!(matches_both.opts_str(&["e".to_string()]).unwrap(), "foo"); - assert_eq!(matches_both.opts_str(&["encrypt".to_string()]).unwrap(), "foo"); - assert_eq!(matches_both.opts_str(&["e".to_string(), "encrypt".to_string()]).unwrap(), + assert_eq!(matches_both.opts_str(&["e".into_string()]).unwrap(), "foo"); + assert_eq!(matches_both.opts_str(&["encrypt".into_string()]).unwrap(), "foo"); + assert_eq!(matches_both.opts_str(&["e".into_string(), "encrypt".into_string()]).unwrap(), "foo"); - assert_eq!(matches_both.opts_str(&["encrypt".to_string(), "e".to_string()]).unwrap(), + assert_eq!(matches_both.opts_str(&["encrypt".into_string(), "e".into_string()]).unwrap(), "foo"); } #[test] fn test_nospace() { - let args = vec!("-Lfoo".to_string(), "-M.".to_string()); + let args = vec!("-Lfoo".into_string(), "-M.".into_string()); let opts = vec!(optmulti("L", "", "library directory", "LIB"), optmulti("M", "", "something", "MMMM")); let matches = &match getopts(args.as_slice(), opts.as_slice()) { result::Result::Ok(m) => m, result::Result::Err(_) => panic!() }; - assert!(matches.opts_present(&["L".to_string()])); - assert_eq!(matches.opts_str(&["L".to_string()]).unwrap(), "foo"); - assert!(matches.opts_present(&["M".to_string()])); - assert_eq!(matches.opts_str(&["M".to_string()]).unwrap(), "."); + assert!(matches.opts_present(&["L".into_string()])); + assert_eq!(matches.opts_str(&["L".into_string()]).unwrap(), "foo"); + assert!(matches.opts_present(&["M".into_string()])); + assert_eq!(matches.opts_str(&["M".into_string()]).unwrap(), "."); } #[test] fn test_nospace_conflict() { - let args = vec!("-vvLverbose".to_string(), "-v".to_string() ); + let args = vec!("-vvLverbose".into_string(), "-v".into_string() ); let opts = vec!(optmulti("L", "", "library directory", "LIB"), optflagmulti("v", "verbose", "Verbose")); let matches = &match getopts(args.as_slice(), opts.as_slice()) { result::Result::Ok(m) => m, result::Result::Err(e) => panic!( "{}", e ) }; - assert!(matches.opts_present(&["L".to_string()])); - assert_eq!(matches.opts_str(&["L".to_string()]).unwrap(), "verbose"); - assert!(matches.opts_present(&["v".to_string()])); + assert!(matches.opts_present(&["L".into_string()])); + assert_eq!(matches.opts_str(&["L".into_string()]).unwrap(), "verbose"); + assert!(matches.opts_present(&["v".into_string()])); assert_eq!(3, matches.opt_count("v")); } #[test] fn test_long_to_short() { let mut short = Opt { - name: Name::Long("banana".to_string()), + name: Name::Long("banana".into_string()), hasarg: HasArg::Yes, occur: Occur::Req, aliases: Vec::new(), @@ -1503,7 +1503,7 @@ mod tests { let opts = vec!( optflagmulti("a", "apple", "Desc")); - let args = vec!("-a".to_string(), "--apple".to_string(), "-a".to_string()); + let args = vec!("-a".into_string(), "--apple".into_string(), "-a".into_string()); let matches = getopts(args.as_slice(), opts.as_slice()).unwrap(); assert_eq!(3, matches.opt_count("a")); @@ -1602,7 +1602,7 @@ Options: optflagopt("p", "", "Desc", "VAL"), optmulti("l", "", "Desc", "VAL")); - let expected = "Usage: fruits -b VAL [-a VAL] [-k] [-p [VAL]] [-l VAL]..".to_string(); + let expected = "Usage: fruits -b VAL [-a VAL] [-k] [-p [VAL]] [-l VAL]..".into_string(); let generated_usage = short_usage("fruits", optgroups.as_slice()); debug!("expected: <<{}>>", expected); diff --git a/src/liblog/directive.rs b/src/liblog/directive.rs index d1db0ec89a16b..7059e318541ca 100644 --- a/src/liblog/directive.rs +++ b/src/liblog/directive.rs @@ -101,13 +101,13 @@ mod tests { fn parse_logging_spec_valid() { let (dirs, filter) = parse_logging_spec("crate1::mod1=1,crate1::mod2,crate2=4"); assert_eq!(dirs.len(), 3); - assert_eq!(dirs[0].name, Some("crate1::mod1".to_string())); + assert_eq!(dirs[0].name, Some("crate1::mod1".into_string())); assert_eq!(dirs[0].level, 1); - assert_eq!(dirs[1].name, Some("crate1::mod2".to_string())); + assert_eq!(dirs[1].name, Some("crate1::mod2".into_string())); assert_eq!(dirs[1].level, ::MAX_LOG_LEVEL); - assert_eq!(dirs[2].name, Some("crate2".to_string())); + assert_eq!(dirs[2].name, Some("crate2".into_string())); assert_eq!(dirs[2].level, 4); assert!(filter.is_none()); } @@ -117,7 +117,7 @@ mod tests { // test parse_logging_spec with multiple = in specification let (dirs, filter) = parse_logging_spec("crate1::mod1=1=2,crate2=4"); assert_eq!(dirs.len(), 1); - assert_eq!(dirs[0].name, Some("crate2".to_string())); + assert_eq!(dirs[0].name, Some("crate2".into_string())); assert_eq!(dirs[0].level, 4); assert!(filter.is_none()); } @@ -127,7 +127,7 @@ mod tests { // test parse_logging_spec with 'noNumber' as log level let (dirs, filter) = parse_logging_spec("crate1::mod1=noNumber,crate2=4"); assert_eq!(dirs.len(), 1); - assert_eq!(dirs[0].name, Some("crate2".to_string())); + assert_eq!(dirs[0].name, Some("crate2".into_string())); assert_eq!(dirs[0].level, 4); assert!(filter.is_none()); } @@ -137,7 +137,7 @@ mod tests { // test parse_logging_spec with 'warn' as log level let (dirs, filter) = parse_logging_spec("crate1::mod1=wrong,crate2=warn"); assert_eq!(dirs.len(), 1); - assert_eq!(dirs[0].name, Some("crate2".to_string())); + assert_eq!(dirs[0].name, Some("crate2".into_string())); assert_eq!(dirs[0].level, ::WARN); assert!(filter.is_none()); } @@ -147,7 +147,7 @@ mod tests { // test parse_logging_spec with '' as log level let (dirs, filter) = parse_logging_spec("crate1::mod1=wrong,crate2="); assert_eq!(dirs.len(), 1); - assert_eq!(dirs[0].name, Some("crate2".to_string())); + assert_eq!(dirs[0].name, Some("crate2".into_string())); assert_eq!(dirs[0].level, ::MAX_LOG_LEVEL); assert!(filter.is_none()); } @@ -159,7 +159,7 @@ mod tests { assert_eq!(dirs.len(), 2); assert_eq!(dirs[0].name, None); assert_eq!(dirs[0].level, 2); - assert_eq!(dirs[1].name, Some("crate2".to_string())); + assert_eq!(dirs[1].name, Some("crate2".into_string())); assert_eq!(dirs[1].level, 4); assert!(filter.is_none()); } @@ -168,13 +168,13 @@ mod tests { fn parse_logging_spec_valid_filter() { let (dirs, filter) = parse_logging_spec("crate1::mod1=1,crate1::mod2,crate2=4/abc"); assert_eq!(dirs.len(), 3); - assert_eq!(dirs[0].name, Some("crate1::mod1".to_string())); + assert_eq!(dirs[0].name, Some("crate1::mod1".into_string())); assert_eq!(dirs[0].level, 1); - assert_eq!(dirs[1].name, Some("crate1::mod2".to_string())); + assert_eq!(dirs[1].name, Some("crate1::mod2".into_string())); assert_eq!(dirs[1].level, ::MAX_LOG_LEVEL); - assert_eq!(dirs[2].name, Some("crate2".to_string())); + assert_eq!(dirs[2].name, Some("crate2".into_string())); assert_eq!(dirs[2].level, 4); assert!(filter.is_some() && filter.unwrap().to_string() == "abc"); } @@ -183,7 +183,7 @@ mod tests { fn parse_logging_spec_invalid_crate_filter() { let (dirs, filter) = parse_logging_spec("crate1::mod1=1=2,crate2=4/a.c"); assert_eq!(dirs.len(), 1); - assert_eq!(dirs[0].name, Some("crate2".to_string())); + assert_eq!(dirs[0].name, Some("crate2".into_string())); assert_eq!(dirs[0].level, 4); assert!(filter.is_some() && filter.unwrap().to_string() == "a.c"); } @@ -192,7 +192,7 @@ mod tests { fn parse_logging_spec_empty_with_filter() { let (dirs, filter) = parse_logging_spec("crate1/a*c"); assert_eq!(dirs.len(), 1); - assert_eq!(dirs[0].name, Some("crate1".to_string())); + assert_eq!(dirs[0].name, Some("crate1".into_string())); assert_eq!(dirs[0].level, ::MAX_LOG_LEVEL); assert!(filter.is_some() && filter.unwrap().to_string() == "a*c"); } diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs index 8b79078eac6ad..1544d150acff5 100644 --- a/src/liblog/lib.rs +++ b/src/liblog/lib.rs @@ -445,11 +445,11 @@ mod tests { fn match_full_path() { let dirs = [ LogDirective { - name: Some("crate2".to_string()), + name: Some("crate2".into_string()), level: 3 }, LogDirective { - name: Some("crate1::mod1".to_string()), + name: Some("crate1::mod1".into_string()), level: 2 } ]; @@ -462,8 +462,8 @@ mod tests { #[test] fn no_match() { let dirs = [ - LogDirective { name: Some("crate2".to_string()), level: 3 }, - LogDirective { name: Some("crate1::mod1".to_string()), level: 2 } + LogDirective { name: Some("crate2".into_string()), level: 3 }, + LogDirective { name: Some("crate1::mod1".into_string()), level: 2 } ]; assert!(!enabled(2, "crate3", dirs.iter())); } @@ -471,8 +471,8 @@ mod tests { #[test] fn match_beginning() { let dirs = [ - LogDirective { name: Some("crate2".to_string()), level: 3 }, - LogDirective { name: Some("crate1::mod1".to_string()), level: 2 } + LogDirective { name: Some("crate2".into_string()), level: 3 }, + LogDirective { name: Some("crate1::mod1".into_string()), level: 2 } ]; assert!(enabled(3, "crate2::mod1", dirs.iter())); } @@ -480,9 +480,9 @@ mod tests { #[test] fn match_beginning_longest_match() { let dirs = [ - LogDirective { name: Some("crate2".to_string()), level: 3 }, - LogDirective { name: Some("crate2::mod".to_string()), level: 4 }, - LogDirective { name: Some("crate1::mod1".to_string()), level: 2 } + LogDirective { name: Some("crate2".into_string()), level: 3 }, + LogDirective { name: Some("crate2::mod".into_string()), level: 4 }, + LogDirective { name: Some("crate1::mod1".into_string()), level: 2 } ]; assert!(enabled(4, "crate2::mod1", dirs.iter())); assert!(!enabled(4, "crate2", dirs.iter())); @@ -492,7 +492,7 @@ mod tests { fn match_default() { let dirs = [ LogDirective { name: None, level: 3 }, - LogDirective { name: Some("crate1::mod1".to_string()), level: 2 } + LogDirective { name: Some("crate1::mod1".into_string()), level: 2 } ]; assert!(enabled(2, "crate1::mod1", dirs.iter())); assert!(enabled(3, "crate2::mod2", dirs.iter())); @@ -502,7 +502,7 @@ mod tests { fn zero_level() { let dirs = [ LogDirective { name: None, level: 3 }, - LogDirective { name: Some("crate1::mod1".to_string()), level: 0 } + LogDirective { name: Some("crate1::mod1".into_string()), level: 0 } ]; assert!(!enabled(1, "crate1::mod1", dirs.iter())); assert!(enabled(3, "crate2::mod2", dirs.iter())); diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs index 55e533aadee7f..c2c24c791c656 100644 --- a/src/libregex/parse.rs +++ b/src/libregex/parse.rs @@ -230,7 +230,7 @@ impl<'a> Parser<'a> { self.caps += 1; self.stack.push(Paren(self.flags, self.caps, - "".to_string())) + "".into_string())) } } ')' => { @@ -808,7 +808,7 @@ impl<'a> Parser<'a> { } if self.cur() == ':' { // Save the old flags with the opening paren. - self.stack.push(Paren(self.flags, 0, "".to_string())); + self.stack.push(Paren(self.flags, 0, "".into_string())); } self.flags = flags; return Ok(()) diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index e19fa01b2e4e8..5f41f1b750c21 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -752,7 +752,7 @@ impl LintPass for UnusedResults { fn check_must_use(cx: &Context, attrs: &[ast::Attribute], sp: Span) -> bool { for attr in attrs.iter() { if attr.check_name("must_use") { - let mut msg = "unused result which must be used".to_string(); + let mut msg = "unused result which must be used".into_string(); // check for #[must_use="..."] match attr.value_str() { None => {} diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index 2d23a61813a9c..9b5bf99e6c50a 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -276,26 +276,26 @@ fn find_libdir(sysroot: &Path) -> String { #[cfg(target_word_size = "64")] fn primary_libdir_name() -> String { - "lib64".to_string() + "lib64".into_string() } #[cfg(target_word_size = "32")] fn primary_libdir_name() -> String { - "lib32".to_string() + "lib32".into_string() } fn secondary_libdir_name() -> String { - "lib".to_string() + "lib".into_string() } } #[cfg(windows)] fn find_libdir(_sysroot: &Path) -> String { - "bin".to_string() + "bin".into_string() } // The name of rustc's own place to organize libraries. // Used to be "rustc", now the default is "rustlib" pub fn rustlibdir() -> String { - "rustlib".to_string() + "rustlib".into_string() } diff --git a/src/librustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs index 5f030324d421e..c38283e75f194 100644 --- a/src/librustc/middle/borrowck/check_loans.rs +++ b/src/librustc/middle/borrowck/check_loans.rs @@ -458,7 +458,7 @@ impl<'a, 'tcx> CheckLoanCtxt<'a, 'tcx> { }; let ol_pronoun = if new_loan.loan_path == old_loan.loan_path { - "it".to_string() + "it".into_string() } else { format!("`{}`", ol) }; diff --git a/src/librustc/middle/borrowck/graphviz.rs b/src/librustc/middle/borrowck/graphviz.rs index 32fa5f8c3a9f2..f5f157c5ca8d3 100644 --- a/src/librustc/middle/borrowck/graphviz.rs +++ b/src/librustc/middle/borrowck/graphviz.rs @@ -57,7 +57,7 @@ impl<'a, 'tcx> DataflowLabeller<'a, 'tcx> { fn dataflow_for(&self, e: EntryOrExit, n: &Node<'a>) -> String { let id = n.val1().data.id; debug!("dataflow_for({}, id={}) {}", e, id, self.variants); - let mut sets = "".to_string(); + let mut sets = "".into_string(); let mut seen_one = false; for &variant in self.variants.iter() { if seen_one { sets.push_str(" "); } else { seen_one = true; } @@ -83,7 +83,7 @@ impl<'a, 'tcx> DataflowLabeller<'a, 'tcx> { dfcx: &DataFlowContext<'a, 'tcx, O>, to_lp: |uint| -> Rc>) -> String { let mut saw_some = false; - let mut set = "{".to_string(); + let mut set = "{".into_string(); dfcx.each_bit_for_node(e, cfgidx, |index| { let lp = to_lp(index); if saw_some { diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs index e90de1b691204..d39a8bf35844f 100644 --- a/src/librustc/middle/borrowck/mod.rs +++ b/src/librustc/middle/borrowck/mod.rs @@ -781,7 +781,7 @@ impl<'a, 'tcx> BorrowckCtxt<'a, 'tcx> { } err_out_of_scope(..) => { let msg = match opt_loan_path(&err.cmt) { - None => "borrowed value".to_string(), + None => "borrowed value".into_string(), Some(lp) => { format!("`{}`", self.loan_path_to_string(&*lp)) } diff --git a/src/librustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs index 150bcbdd68867..9656ad20741f9 100644 --- a/src/librustc/middle/const_eval.rs +++ b/src/librustc/middle/const_eval.rs @@ -377,8 +377,8 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Ok(const_float(-f)), Ok(const_int(i)) => Ok(const_int(-i)), Ok(const_uint(i)) => Ok(const_uint(-i)), - Ok(const_str(_)) => Err("negate on string".to_string()), - Ok(const_bool(_)) => Err("negate on boolean".to_string()), + Ok(const_str(_)) => Err("negate on string".into_string()), + Ok(const_bool(_)) => Err("negate on boolean".into_string()), ref err => ((*err).clone()) } } @@ -387,7 +387,7 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Ok(const_int(!i)), Ok(const_uint(i)) => Ok(const_uint(!i)), Ok(const_bool(b)) => Ok(const_bool(!b)), - _ => Err("not on float or string".to_string()) + _ => Err("not on float or string".into_string()) } } ast::ExprBinary(op, ref a, ref b) => { @@ -406,7 +406,7 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result fromb(a != b), ast::BiGe => fromb(a >= b), ast::BiGt => fromb(a > b), - _ => Err("can't do this op on floats".to_string()) + _ => Err("can't do this op on floats".into_string()) } } (Ok(const_int(a)), Ok(const_int(b))) => { @@ -415,12 +415,12 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Ok(const_int(a - b)), ast::BiMul => Ok(const_int(a * b)), ast::BiDiv if b == 0 => { - Err("attempted to divide by zero".to_string()) + Err("attempted to divide by zero".into_string()) } ast::BiDiv => Ok(const_int(a / b)), ast::BiRem if b == 0 => { Err("attempted remainder with a divisor of \ - zero".to_string()) + zero".into_string()) } ast::BiRem => Ok(const_int(a % b)), ast::BiAnd | ast::BiBitAnd => Ok(const_int(a & b)), @@ -442,12 +442,12 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Ok(const_uint(a - b)), ast::BiMul => Ok(const_uint(a * b)), ast::BiDiv if b == 0 => { - Err("attempted to divide by zero".to_string()) + Err("attempted to divide by zero".into_string()) } ast::BiDiv => Ok(const_uint(a / b)), ast::BiRem if b == 0 => { Err("attempted remainder with a divisor of \ - zero".to_string()) + zero".into_string()) } ast::BiRem => Ok(const_uint(a % b)), ast::BiAnd | ast::BiBitAnd => Ok(const_uint(a & b)), @@ -468,14 +468,14 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Ok(const_int(a << b as uint)), ast::BiShr => Ok(const_int(a >> b as uint)), - _ => Err("can't do this op on an int and uint".to_string()) + _ => Err("can't do this op on an int and uint".into_string()) } } (Ok(const_uint(a)), Ok(const_int(b))) => { match op { ast::BiShl => Ok(const_uint(a << b as uint)), ast::BiShr => Ok(const_uint(a >> b as uint)), - _ => Err("can't do this op on a uint and int".to_string()) + _ => Err("can't do this op on a uint and int".into_string()) } } (Ok(const_bool(a)), Ok(const_bool(b))) => { @@ -487,10 +487,10 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result a | b, ast::BiEq => a == b, ast::BiNe => a != b, - _ => return Err("can't do this op on bools".to_string()) + _ => return Err("can't do this op on bools".into_string()) })) } - _ => Err("bad operands for binary".to_string()) + _ => Err("bad operands for binary".into_string()) } } ast::ExprCast(ref base, ref target_ty) => { @@ -523,7 +523,7 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Err("can't cast this type".to_string()) + _ => Err("can't cast this type".into_string()) }) ) @@ -546,7 +546,7 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result { match lookup_const(tcx, e) { Some(actual_e) => eval_const_expr_partial(tcx, &*actual_e), - None => Err("non-constant path in constant expr".to_string()) + None => Err("non-constant path in constant expr".into_string()) } } ast::ExprLit(ref lit) => Ok(lit_to_const(&**lit)), @@ -564,11 +564,11 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result index.node { return eval_const_expr_partial(tcx, &*fields[index.node]) } else { - return Err("tuple index out of bounds".to_string()) + return Err("tuple index out of bounds".into_string()) } } - Err("non-constant struct in constant expr".to_string()) + Err("non-constant struct in constant expr".into_string()) } ast::ExprField(ref base, field_name) => { // Get the base expression if it is a struct and it is constant @@ -579,13 +579,13 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result Err("unsupported constant expr".to_string()) + _ => Err("unsupported constant expr".into_string()) } } diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs index db8fd999f380b..fad4c189e58e4 100644 --- a/src/librustc/middle/dataflow.rs +++ b/src/librustc/middle/dataflow.rs @@ -126,14 +126,14 @@ impl<'a, 'tcx, O:DataFlowOperator> pprust::PpAnn for DataFlowContext<'a, 'tcx, O let gens_str = if gens.iter().any(|&u| u != 0) { format!(" gen: {}", bits_to_string(gens)) } else { - "".to_string() + "".into_string() }; let kills = self.kills.slice(start, end); let kills_str = if kills.iter().any(|&u| u != 0) { format!(" kill: {}", bits_to_string(kills)) } else { - "".to_string() + "".into_string() }; try!(ps.synth_comment(format!("id {}: {}{}{}", id, entry_str, diff --git a/src/librustc/middle/infer/equate.rs b/src/librustc/middle/infer/equate.rs index a79a50b1781eb..12544f99a08b2 100644 --- a/src/librustc/middle/infer/equate.rs +++ b/src/librustc/middle/infer/equate.rs @@ -34,7 +34,7 @@ pub fn Equate<'f, 'tcx>(cf: CombineFields<'f, 'tcx>) -> Equate<'f, 'tcx> { impl<'f, 'tcx> Combine<'tcx> for Equate<'f, 'tcx> { fn infcx<'a>(&'a self) -> &'a InferCtxt<'a, 'tcx> { self.fields.infcx } - fn tag(&self) -> String { "eq".to_string() } + fn tag(&self) -> String { "eq".into_string() } fn a_is_expected(&self) -> bool { self.fields.a_is_expected } fn trace(&self) -> TypeTrace<'tcx> { self.fields.trace.clone() } diff --git a/src/librustc/middle/infer/error_reporting.rs b/src/librustc/middle/infer/error_reporting.rs index 657ee088758d1..4fc2f366ff26a 100644 --- a/src/librustc/middle/infer/error_reporting.rs +++ b/src/librustc/middle/infer/error_reporting.rs @@ -1444,12 +1444,12 @@ impl<'a, 'tcx> ErrorReportingHelpers<'tcx> for InferCtxt<'a, 'tcx> { fn report_inference_failure(&self, var_origin: RegionVariableOrigin) { let var_description = match var_origin { - infer::MiscVariable(_) => "".to_string(), - infer::PatternRegion(_) => " for pattern".to_string(), - infer::AddrOfRegion(_) => " for borrow expression".to_string(), - infer::AddrOfSlice(_) => " for slice expression".to_string(), - infer::Autoref(_) => " for autoref".to_string(), - infer::Coercion(_) => " for automatic coercion".to_string(), + infer::MiscVariable(_) => "".into_string(), + infer::PatternRegion(_) => " for pattern".into_string(), + infer::AddrOfRegion(_) => " for borrow expression".into_string(), + infer::AddrOfSlice(_) => " for slice expression".into_string(), + infer::Autoref(_) => " for autoref".into_string(), + infer::Coercion(_) => " for automatic coercion".into_string(), infer::LateBoundRegion(_, br, infer::FnCall) => { format!(" for {}in function call", bound_region_to_string(self.tcx, "lifetime parameter ", true, br)) diff --git a/src/librustc/middle/infer/glb.rs b/src/librustc/middle/infer/glb.rs index 4237a7af32fc1..5a38976ca69f9 100644 --- a/src/librustc/middle/infer/glb.rs +++ b/src/librustc/middle/infer/glb.rs @@ -37,7 +37,7 @@ pub fn Glb<'f, 'tcx>(cf: CombineFields<'f, 'tcx>) -> Glb<'f, 'tcx> { impl<'f, 'tcx> Combine<'tcx> for Glb<'f, 'tcx> { fn infcx<'a>(&'a self) -> &'a InferCtxt<'a, 'tcx> { self.fields.infcx } - fn tag(&self) -> String { "glb".to_string() } + fn tag(&self) -> String { "glb".into_string() } fn a_is_expected(&self) -> bool { self.fields.a_is_expected } fn trace(&self) -> TypeTrace<'tcx> { self.fields.trace.clone() } diff --git a/src/librustc/middle/infer/lub.rs b/src/librustc/middle/infer/lub.rs index f53ba571062b2..080319605437d 100644 --- a/src/librustc/middle/infer/lub.rs +++ b/src/librustc/middle/infer/lub.rs @@ -38,7 +38,7 @@ pub fn Lub<'f, 'tcx>(cf: CombineFields<'f, 'tcx>) -> Lub<'f, 'tcx> { impl<'f, 'tcx> Combine<'tcx> for Lub<'f, 'tcx> { fn infcx<'a>(&'a self) -> &'a InferCtxt<'a, 'tcx> { self.fields.infcx } - fn tag(&self) -> String { "lub".to_string() } + fn tag(&self) -> String { "lub".into_string() } fn a_is_expected(&self) -> bool { self.fields.a_is_expected } fn trace(&self) -> TypeTrace<'tcx> { self.fields.trace.clone() } diff --git a/src/librustc/middle/infer/mod.rs b/src/librustc/middle/infer/mod.rs index 81cd8dd20d20c..64e04cff45ea4 100644 --- a/src/librustc/middle/infer/mod.rs +++ b/src/librustc/middle/infer/mod.rs @@ -290,13 +290,13 @@ pub fn fixup_err_to_string(f: fixup_err) -> String { match f { unresolved_int_ty(_) => { "cannot determine the type of this integer; add a suffix to \ - specify the type explicitly".to_string() + specify the type explicitly".into_string() } unresolved_float_ty(_) => { "cannot determine the type of this number; add a suffix to specify \ - the type explicitly".to_string() + the type explicitly".into_string() } - unresolved_ty(_) => "unconstrained type".to_string(), + unresolved_ty(_) => "unconstrained type".into_string(), } } @@ -924,7 +924,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { match resolved_expected { Some(t) if ty::type_is_error(t) => (), _ => { - let error_str = err.map_or("".to_string(), |t_err| { + let error_str = err.map_or("".into_string(), |t_err| { format!(" ({})", ty::type_err_to_str(self.tcx, t_err)) }); diff --git a/src/librustc/middle/infer/sub.rs b/src/librustc/middle/infer/sub.rs index c470b2488273a..1c32fce6df08a 100644 --- a/src/librustc/middle/infer/sub.rs +++ b/src/librustc/middle/infer/sub.rs @@ -38,7 +38,7 @@ pub fn Sub<'f, 'tcx>(cf: CombineFields<'f, 'tcx>) -> Sub<'f, 'tcx> { impl<'f, 'tcx> Combine<'tcx> for Sub<'f, 'tcx> { fn infcx<'a>(&'a self) -> &'a InferCtxt<'a, 'tcx> { self.fields.infcx } - fn tag(&self) -> String { "sub".to_string() } + fn tag(&self) -> String { "sub".into_string() } fn a_is_expected(&self) -> bool { self.fields.a_is_expected } fn trace(&self) -> TypeTrace<'tcx> { self.fields.trace.clone() } diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 5edbafc4e0bee..f179084bbc86e 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -181,7 +181,7 @@ fn live_node_kind_to_string(lnk: LiveNodeKind, cx: &ty::ctxt) -> String { VarDefNode(s) => { format!("Var def node [{}]", cm.span_to_string(s)) } - ExitNode => "Exit node".to_string(), + ExitNode => "Exit node".into_string(), } } @@ -343,8 +343,8 @@ impl<'a, 'tcx> IrMaps<'a, 'tcx> { Local(LocalInfo { ident: nm, .. }) | Arg(_, nm) => { token::get_ident(nm).get().to_string() }, - ImplicitRet => "".to_string(), - CleanExit => "".to_string() + ImplicitRet => "".into_string(), + CleanExit => "".into_string() } } diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index 302fbd53dd530..ba065a42ec610 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -1344,17 +1344,17 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> { match cmt.cat { cat_static_item => { - "static item".to_string() + "static item".into_string() } cat_rvalue(..) => { - "non-lvalue".to_string() + "non-lvalue".into_string() } cat_local(vid) => { match self.tcx().map.find(vid) { Some(ast_map::NodeArg(_)) => { - "argument".to_string() + "argument".into_string() } - _ => "local variable".to_string() + _ => "local variable".into_string() } } cat_deref(_, _, pk) => { @@ -1367,7 +1367,7 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> { None => { match pk { Implicit(..) => { - "dereference (dereference is implicit, due to indexing)".to_string() + "dereference (dereference is implicit, due to indexing)".into_string() } OwnedPtr => format!("dereference of `{}`", ptr_sigil(pk)), _ => format!("dereference of `{}`-pointer", ptr_sigil(pk)) @@ -1376,16 +1376,16 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> { } } cat_interior(_, InteriorField(NamedField(_))) => { - "field".to_string() + "field".into_string() } cat_interior(_, InteriorField(PositionalField(_))) => { - "anonymous field".to_string() + "anonymous field".into_string() } cat_interior(_, InteriorElement(VecElement)) => { - "vec content".to_string() + "vec content".into_string() } cat_interior(_, InteriorElement(OtherElement)) => { - "indexed content".to_string() + "indexed content".into_string() } cat_upvar(ref var) => { upvar_to_string(var, true) @@ -1561,7 +1561,7 @@ impl<'tcx> Repr<'tcx> for InteriorKind { token::get_name(fld).get().to_string() } InteriorField(PositionalField(i)) => format!("#{}", i), - InteriorElement(_) => "[]".to_string(), + InteriorElement(_) => "[]".into_string(), } } } diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 36b87bbd42392..5c557f8b3c3eb 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -2426,7 +2426,7 @@ impl<'a> Resolver<'a> { SingleImport(_, source) => { token::get_name(source).get().to_string() } - GlobImport => "*".to_string() + GlobImport => "*".into_string() } } @@ -3270,7 +3270,7 @@ impl<'a> Resolver<'a> { self.module_to_string(&*self.current_module); let prefix = if target_mod_str == current_mod_str { - "self::".to_string() + "self::".into_string() } else { format!("{}::", target_mod_str) }; @@ -5294,7 +5294,7 @@ impl<'a> Resolver<'a> { .add_lint(lint::builtin::UNUSED_QUALIFICATIONS, id, path.span, - "unnecessary qualification".to_string()); + "unnecessary qualification".into_string()); } _ => () } @@ -5826,7 +5826,7 @@ impl<'a> Resolver<'a> { // limit search to 5 to reduce the number // of stupid suggestions self.find_best_match_for_name(wrong_name.as_slice(), 5) - .map_or("".to_string(), + .map_or("".into_string(), |x| format!("`{}`", x)) } Field => @@ -6129,7 +6129,7 @@ impl<'a> Resolver<'a> { self.session.add_lint(lint::builtin::UNUSED_EXTERN_CRATES, id, vi.span, - "unused extern crate".to_string()); + "unused extern crate".into_string()); } } }, @@ -6149,7 +6149,7 @@ impl<'a> Resolver<'a> { .add_lint(lint::builtin::UNUSED_IMPORTS, id, p.span, - "unused import".to_string()); + "unused import".into_string()); } }, } @@ -6173,7 +6173,7 @@ impl<'a> Resolver<'a> { self.session.add_lint(lint::builtin::UNUSED_IMPORTS, id, span, - "unused import".to_string()); + "unused import".into_string()); } let (v_priv, t_priv) = match self.last_private.get(&id) { @@ -6242,7 +6242,7 @@ impl<'a> Resolver<'a> { collect_mod(&mut names, module); if names.len() == 0 { - return "???".to_string(); + return "???".into_string(); } self.names_to_string(names.into_iter().rev() .collect::>() @@ -6264,18 +6264,18 @@ impl<'a> Resolver<'a> { for (&name, import_resolution) in import_resolutions.iter() { let value_repr; match import_resolution.target_for_namespace(ValueNS) { - None => { value_repr = "".to_string(); } + None => { value_repr = "".into_string(); } Some(_) => { - value_repr = " value:?".to_string(); + value_repr = " value:?".into_string(); // FIXME #4954 } } let type_repr; match import_resolution.target_for_namespace(TypeNS) { - None => { type_repr = "".to_string(); } + None => { type_repr = "".into_string(); } Some(_) => { - type_repr = " type:?".to_string(); + type_repr = " type:?".into_string(); // FIXME #4954 } } diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 4c4b5d07f50ac..e05e07d80a1a4 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -4298,35 +4298,35 @@ pub fn ty_sort_string<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> String { ty_tup(ref tys) if tys.is_empty() => ::util::ppaux::ty_to_string(cx, ty), ty_enum(id, _) => format!("enum {}", item_path_str(cx, id)), - ty_uniq(_) => "box".to_string(), + ty_uniq(_) => "box".into_string(), ty_vec(_, Some(n)) => format!("array of {} elements", n), - ty_vec(_, None) => "slice".to_string(), - ty_ptr(_) => "*-ptr".to_string(), - ty_rptr(_, _) => "&-ptr".to_string(), - ty_bare_fn(_) => "extern fn".to_string(), - ty_closure(_) => "fn".to_string(), + ty_vec(_, None) => "slice".into_string(), + ty_ptr(_) => "*-ptr".into_string(), + ty_rptr(_, _) => "&-ptr".into_string(), + ty_bare_fn(_) => "extern fn".into_string(), + ty_closure(_) => "fn".into_string(), ty_trait(ref inner) => { format!("trait {}", item_path_str(cx, inner.principal.def_id)) } ty_struct(id, _) => { format!("struct {}", item_path_str(cx, id)) } - ty_unboxed_closure(..) => "closure".to_string(), - ty_tup(_) => "tuple".to_string(), - ty_infer(TyVar(_)) => "inferred type".to_string(), - ty_infer(IntVar(_)) => "integral variable".to_string(), - ty_infer(FloatVar(_)) => "floating-point variable".to_string(), - ty_infer(SkolemizedTy(_)) => "skolemized type".to_string(), - ty_infer(SkolemizedIntTy(_)) => "skolemized integral type".to_string(), + ty_unboxed_closure(..) => "closure".into_string(), + ty_tup(_) => "tuple".into_string(), + ty_infer(TyVar(_)) => "inferred type".into_string(), + ty_infer(IntVar(_)) => "integral variable".into_string(), + ty_infer(FloatVar(_)) => "floating-point variable".into_string(), + ty_infer(SkolemizedTy(_)) => "skolemized type".into_string(), + ty_infer(SkolemizedIntTy(_)) => "skolemized integral type".into_string(), ty_param(ref p) => { if p.space == subst::SelfSpace { - "Self".to_string() + "Self".into_string() } else { - "type parameter".to_string() + "type parameter".into_string() } } - ty_err => "type error".to_string(), - ty_open(_) => "opened DST".to_string(), + ty_err => "type error".into_string(), + ty_open(_) => "opened DST".into_string(), } } @@ -4337,14 +4337,14 @@ pub fn ty_sort_string<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> String { pub fn type_err_to_str<'tcx>(cx: &ctxt<'tcx>, err: &type_err<'tcx>) -> String { fn tstore_to_closure(s: &TraitStore) -> String { match s { - &UniqTraitStore => "proc".to_string(), - &RegionTraitStore(..) => "closure".to_string() + &UniqTraitStore => "proc".into_string(), + &RegionTraitStore(..) => "closure".into_string() } } match *err { - terr_cyclic_ty => "cyclic type of infinite size".to_string(), - terr_mismatch => "types differ".to_string(), + terr_cyclic_ty => "cyclic type of infinite size".into_string(), + terr_mismatch => "types differ".into_string(), terr_fn_style_mismatch(values) => { format!("expected {} fn, found {} fn", values.expected.to_string(), @@ -4365,13 +4365,13 @@ pub fn type_err_to_str<'tcx>(cx: &ctxt<'tcx>, err: &type_err<'tcx>) -> String { tstore_to_closure(&values.expected), tstore_to_closure(&values.found)) } - terr_mutability => "values differ in mutability".to_string(), + terr_mutability => "values differ in mutability".into_string(), terr_box_mutability => { - "boxed values differ in mutability".to_string() + "boxed values differ in mutability".into_string() } - terr_vec_mutability => "vectors differ in mutability".to_string(), - terr_ptr_mutability => "pointers differ in mutability".to_string(), - terr_ref_mutability => "references differ in mutability".to_string(), + terr_vec_mutability => "vectors differ in mutability".into_string(), + terr_ptr_mutability => "pointers differ in mutability".into_string(), + terr_ref_mutability => "references differ in mutability".into_string(), terr_ty_param_size(values) => { format!("expected a type with {} type params, \ found one with {} type params", @@ -4391,16 +4391,16 @@ pub fn type_err_to_str<'tcx>(cx: &ctxt<'tcx>, err: &type_err<'tcx>) -> String { values.found) } terr_arg_count => { - "incorrect number of function parameters".to_string() + "incorrect number of function parameters".into_string() } terr_regions_does_not_outlive(..) => { - "lifetime mismatch".to_string() + "lifetime mismatch".into_string() } terr_regions_not_same(..) => { - "lifetimes are not the same".to_string() + "lifetimes are not the same".into_string() } terr_regions_no_overlap(..) => { - "lifetimes do not intersect".to_string() + "lifetimes do not intersect".into_string() } terr_regions_insufficiently_polymorphic(br, _) => { format!("expected bound lifetime parameter {}, \ @@ -4447,7 +4447,7 @@ pub fn type_err_to_str<'tcx>(cx: &ctxt<'tcx>, err: &type_err<'tcx>) -> String { } } terr_integer_as_char => { - "expected an integral type, found `char`".to_string() + "expected an integral type, found `char`".into_string() } terr_int_mismatch(ref values) => { format!("expected `{}`, found `{}`", diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index c7b5e1e8de9a5..2efa41d15a209 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -131,7 +131,7 @@ impl Input { pub fn filestem(&self) -> String { match *self { Input::File(ref ifile) => ifile.filestem_str().unwrap().to_string(), - Input::Str(_) => "rust_out".to_string(), + Input::Str(_) => "rust_out".into_string(), } } } @@ -478,7 +478,7 @@ cgoptions!( "perform LLVM link-time optimizations"), target_cpu: Option = (None, parse_opt_string, "select target processor (llc -mcpu=help for details)"), - target_feature: String = ("".to_string(), parse_string, + target_feature: String = ("".into_string(), parse_string, "target specific attributes (llc -mattr=help for details)"), passes: Vec = (Vec::new(), parse_list, "a list of extra LLVM passes to run (space separated)"), @@ -508,7 +508,7 @@ cgoptions!( "choose the code model to use (llc -code-model for details)"), metadata: Vec = (Vec::new(), parse_list, "metadata to mangle symbol names with"), - extra_filename: String = ("".to_string(), parse_string, + extra_filename: String = ("".into_string(), parse_string, "extra data to put in each output filename"), codegen_units: uint = (1, parse_uint, "divide crate into N units to optimize in parallel"), @@ -702,7 +702,7 @@ pub fn optgroups() -> Vec { // Convert strings provided as --cfg [cfgspec] into a crate_cfg pub fn parse_cfgspecs(cfgspecs: Vec ) -> ast::CrateConfig { cfgspecs.into_iter().map(|s| { - parse::parse_meta_from_source_str("cfgspec".to_string(), + parse::parse_meta_from_source_str("cfgspec".into_string(), s.to_string(), Vec::new(), &parse::new_parse_sess()) @@ -979,7 +979,7 @@ mod test { #[test] fn test_switch_implies_cfg_test() { let matches = - &match getopts(&["--test".to_string()], optgroups().as_slice()) { + &match getopts(&["--test".into_string()], optgroups().as_slice()) { Ok(m) => m, Err(f) => panic!("test_switch_implies_cfg_test: {}", f) }; @@ -995,7 +995,7 @@ mod test { #[test] fn test_switch_implies_cfg_test_unless_cfg_test() { let matches = - &match getopts(&["--test".to_string(), "--cfg=test".to_string()], + &match getopts(&["--test".into_string(), "--cfg=test".into_string()], optgroups().as_slice()) { Ok(m) => m, Err(f) => { @@ -1015,7 +1015,7 @@ mod test { fn test_can_print_warnings() { { let matches = getopts(&[ - "-Awarnings".to_string() + "-Awarnings".into_string() ], optgroups().as_slice()).unwrap(); let registry = diagnostics::registry::Registry::new(&[]); let sessopts = build_session_options(&matches); @@ -1025,8 +1025,8 @@ mod test { { let matches = getopts(&[ - "-Awarnings".to_string(), - "-Dwarnings".to_string() + "-Awarnings".into_string(), + "-Dwarnings".into_string() ], optgroups().as_slice()).unwrap(); let registry = diagnostics::registry::Registry::new(&[]); let sessopts = build_session_options(&matches); @@ -1036,7 +1036,7 @@ mod test { { let matches = getopts(&[ - "-Adead_code".to_string() + "-Adead_code".into_string() ], optgroups().as_slice()).unwrap(); let registry = diagnostics::registry::Registry::new(&[]); let sessopts = build_session_options(&matches); diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 3895a11372674..8e5736f5b8f47 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -117,7 +117,7 @@ pub fn explain_region_and_span(cx: &ctxt, region: ty::Region) BrAnon(idx) => { format!("the anonymous lifetime #{} defined on", idx + 1) } - BrFresh(_) => "an anonymous lifetime defined on".to_string(), + BrFresh(_) => "an anonymous lifetime defined on".into_string(), _ => { format!("the lifetime {} as defined on", bound_region_ptr_to_string(cx, fr.bound_region)) @@ -141,9 +141,9 @@ pub fn explain_region_and_span(cx: &ctxt, region: ty::Region) } } - ReStatic => { ("the static lifetime".to_string(), None) } + ReStatic => { ("the static lifetime".into_string(), None) } - ReEmpty => { ("the empty lifetime".to_string(), None) } + ReEmpty => { ("the empty lifetime".into_string(), None) } ReEarlyBound(_, _, _, name) => { (format!("{}", token::get_name(name)), None) @@ -221,8 +221,8 @@ pub fn region_to_string(cx: &ctxt, prefix: &str, space: bool, region: Region) -> pub fn mutability_to_string(m: ast::Mutability) -> String { match m { - ast::MutMutable => "mut ".to_string(), - ast::MutImmutable => "".to_string(), + ast::MutMutable => "mut ".into_string(), + ast::MutImmutable => "".into_string(), } } @@ -234,7 +234,7 @@ pub fn mt_to_string<'tcx>(cx: &ctxt<'tcx>, m: &mt<'tcx>) -> String { pub fn trait_store_to_string(cx: &ctxt, s: ty::TraitStore) -> String { match s { - ty::UniqTraitStore => "Box ".to_string(), + ty::UniqTraitStore => "Box ".into_string(), ty::RegionTraitStore(r, m) => { format!("{}{}", region_ptr_to_string(cx, r), mutability_to_string(m)) } @@ -379,8 +379,8 @@ pub fn ty_to_string<'tcx>(cx: &ctxt<'tcx>, typ: &ty::TyS<'tcx>) -> String { // pretty print the structural type representation: match typ.sty { - ty_bool => "bool".to_string(), - ty_char => "char".to_string(), + ty_bool => "bool".into_string(), + ty_char => "char".into_string(), ty_int(t) => ast_util::int_ty_to_string(t, None).to_string(), ty_uint(t) => ast_util::uint_ty_to_string(t, None).to_string(), ty_float(t) => ast_util::float_ty_to_string(t).to_string(), @@ -415,7 +415,7 @@ pub fn ty_to_string<'tcx>(cx: &ctxt<'tcx>, typ: &ty::TyS<'tcx>) -> String { bare_fn_to_string(cx, f.fn_style, f.abi, None, &f.sig) } ty_infer(infer_ty) => infer_ty_to_string(cx, infer_ty), - ty_err => "[type error]".to_string(), + ty_err => "[type error]".into_string(), ty_param(ref param_ty) => { if cx.sess.verbose() { param_ty.repr(cx) @@ -442,12 +442,12 @@ pub fn ty_to_string<'tcx>(cx: &ctxt<'tcx>, typ: &ty::TyS<'tcx>) -> String { bound_sep, bound_str) } - ty_str => "str".to_string(), + ty_str => "str".into_string(), ty_unboxed_closure(ref did, _, ref substs) => { let unboxed_closures = cx.unboxed_closures.borrow(); unboxed_closures.get(did).map(|cl| { closure_to_string(cx, &cl.closure_type.subst(cx, substs)) - }).unwrap_or_else(|| "closure".to_string()) + }).unwrap_or_else(|| "closure".into_string()) } ty_vec(t, sz) => { let inner_str = ty_to_string(cx, t); @@ -546,7 +546,7 @@ pub fn ty_to_short_str<'tcx>(cx: &ctxt<'tcx>, typ: Ty<'tcx>) -> String { impl<'tcx, T:Repr<'tcx>> Repr<'tcx> for Option { fn repr(&self, tcx: &ctxt<'tcx>) -> String { match self { - &None => "None".to_string(), + &None => "None".into_string(), &Some(ref t) => t.repr(tcx), } } @@ -569,7 +569,7 @@ impl<'tcx,T:Repr<'tcx>,U:Repr<'tcx>> Repr<'tcx> for Result { impl<'tcx> Repr<'tcx> for () { fn repr(&self, _tcx: &ctxt) -> String { - "()".to_string() + "()".into_string() } } @@ -687,7 +687,7 @@ impl<'tcx> Repr<'tcx> for ty::ItemSubsts<'tcx> { impl<'tcx> Repr<'tcx> for subst::RegionSubsts { fn repr(&self, tcx: &ctxt) -> String { match *self { - subst::ErasedRegions => "erased".to_string(), + subst::ErasedRegions => "erased".into_string(), subst::NonerasedRegions(ref regions) => regions.repr(tcx) } } @@ -698,10 +698,10 @@ impl<'tcx> Repr<'tcx> for ty::BuiltinBounds { let mut res = Vec::new(); for b in self.iter() { res.push(match b { - ty::BoundSend => "Send".to_string(), - ty::BoundSized => "Sized".to_string(), - ty::BoundCopy => "Copy".to_string(), - ty::BoundSync => "Sync".to_string(), + ty::BoundSend => "Send".into_string(), + ty::BoundSized => "Sized".into_string(), + ty::BoundCopy => "Copy".into_string(), + ty::BoundSync => "Sync".into_string(), }); } res.connect("+") @@ -818,7 +818,7 @@ impl<'tcx> Repr<'tcx> for ty::BoundRegion { format!("BrNamed({}, {})", id.repr(tcx), token::get_name(name)) } ty::BrFresh(id) => format!("BrFresh({})", id), - ty::BrEnv => "BrEnv".to_string() + ty::BrEnv => "BrEnv".into_string() } } } @@ -847,7 +847,7 @@ impl<'tcx> Repr<'tcx> for ty::Region { } ty::ReStatic => { - "ReStatic".to_string() + "ReStatic".into_string() } ty::ReInfer(ReVar(ref vid)) => { @@ -859,7 +859,7 @@ impl<'tcx> Repr<'tcx> for ty::Region { } ty::ReEmpty => { - "ReEmpty".to_string() + "ReEmpty".into_string() } } } @@ -1011,7 +1011,7 @@ impl<'tcx> Repr<'tcx> for ty::FnOutput<'tcx> { ty::FnConverging(ty) => format!("FnConverging({0})", ty.repr(tcx)), ty::FnDiverging => - "FnDiverging".to_string() + "FnDiverging".into_string() } } } @@ -1076,10 +1076,10 @@ impl<'tcx> Repr<'tcx> for ty::BuiltinBound { impl<'tcx> UserString<'tcx> for ty::BuiltinBound { fn user_string(&self, _tcx: &ctxt) -> String { match *self { - ty::BoundSend => "Send".to_string(), - ty::BoundSized => "Sized".to_string(), - ty::BoundCopy => "Copy".to_string(), - ty::BoundSync => "Sync".to_string(), + ty::BoundSend => "Send".into_string(), + ty::BoundSized => "Sized".into_string(), + ty::BoundCopy => "Copy".into_string(), + ty::BoundSync => "Sync".into_string(), } } } diff --git a/src/librustc_back/arm.rs b/src/librustc_back/arm.rs index ea4d5c820f8b8..e6b9f0289ea04 100644 --- a/src/librustc_back/arm.rs +++ b/src/librustc_back/arm.rs @@ -13,12 +13,12 @@ use syntax::abi; pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t { let cc_args = if target_triple.contains("thumb") { - vec!("-mthumb".to_string()) + vec!("-mthumb".into_string()) } else { - vec!("-marm".to_string()) + vec!("-marm".into_string()) }; return target_strs::t { - module_asm: "".to_string(), + module_asm: "".into_string(), data_layout: match target_os { abi::OsMacos => { @@ -26,7 +26,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsiOS => { @@ -34,7 +34,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsWindows => { @@ -42,7 +42,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsLinux => { @@ -50,7 +50,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsAndroid => { @@ -58,7 +58,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsFreebsd | abi::OsDragonfly => { @@ -66,7 +66,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } }, diff --git a/src/librustc_back/mips.rs b/src/librustc_back/mips.rs index 322f001c31e1b..229ec242ef7d4 100644 --- a/src/librustc_back/mips.rs +++ b/src/librustc_back/mips.rs @@ -13,7 +13,7 @@ use syntax::abi; pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t { return target_strs::t { - module_asm: "".to_string(), + module_asm: "".into_string(), data_layout: match target_os { abi::OsMacos => { @@ -21,7 +21,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsiOS => { @@ -29,7 +29,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsWindows => { @@ -37,7 +37,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsLinux => { @@ -45,7 +45,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsAndroid => { @@ -53,7 +53,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsFreebsd | abi::OsDragonfly => { @@ -61,7 +61,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } }, diff --git a/src/librustc_back/mipsel.rs b/src/librustc_back/mipsel.rs index e7ce5b0a429bc..c9f9dedbcbdc2 100644 --- a/src/librustc_back/mipsel.rs +++ b/src/librustc_back/mipsel.rs @@ -13,7 +13,7 @@ use syntax::abi; pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t { return target_strs::t { - module_asm: "".to_string(), + module_asm: "".into_string(), data_layout: match target_os { abi::OsMacos => { @@ -21,7 +21,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsiOS => { @@ -29,7 +29,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsWindows => { @@ -37,7 +37,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsLinux => { @@ -45,7 +45,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsAndroid => { @@ -53,7 +53,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } abi::OsFreebsd | abi::OsDragonfly => { @@ -61,7 +61,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string() + -a0:0:64-n32".into_string() } }, diff --git a/src/librustc_back/rpath.rs b/src/librustc_back/rpath.rs index a90b49ba101fa..e986bf4434aba 100644 --- a/src/librustc_back/rpath.rs +++ b/src/librustc_back/rpath.rs @@ -141,8 +141,8 @@ mod test { #[test] fn test_rpaths_to_flags() { let flags = rpaths_to_flags(&[ - "path1".to_string(), - "path2".to_string() + "path1".into_string(), + "path2".into_string() ]); assert_eq!(flags, ["-Wl,-rpath,path1", @@ -152,9 +152,9 @@ mod test { #[test] fn test_minimize1() { let res = minimize_rpaths(&[ - "rpath1".to_string(), - "rpath2".to_string(), - "rpath1".to_string() + "rpath1".into_string(), + "rpath2".into_string(), + "rpath1".into_string() ]); assert!(res == [ "rpath1", @@ -165,16 +165,16 @@ mod test { #[test] fn test_minimize2() { let res = minimize_rpaths(&[ - "1a".to_string(), - "2".to_string(), - "2".to_string(), - "1a".to_string(), - "4a".to_string(), - "1a".to_string(), - "2".to_string(), - "3".to_string(), - "4a".to_string(), - "3".to_string() + "1a".into_string(), + "2".into_string(), + "2".into_string(), + "1a".into_string(), + "4a".into_string(), + "1a".into_string(), + "2".into_string(), + "3".into_string(), + "4a".into_string(), + "3".into_string() ]); assert!(res == [ "1a", diff --git a/src/librustc_back/sha2.rs b/src/librustc_back/sha2.rs index 1b662ef178760..7645aad2333b0 100644 --- a/src/librustc_back/sha2.rs +++ b/src/librustc_back/sha2.rs @@ -581,21 +581,21 @@ mod tests { // Examples from wikipedia let wikipedia_tests = vec!( Test { - input: "".to_string(), + input: "".into_string(), output_str: "e3b0c44298fc1c149afb\ - f4c8996fb92427ae41e4649b934ca495991b7852b855".to_string() + f4c8996fb92427ae41e4649b934ca495991b7852b855".into_string() }, Test { input: "The quick brown fox jumps over the lazy \ - dog".to_string(), + dog".into_string(), output_str: "d7a8fbb307d7809469ca\ - 9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592".to_string() + 9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592".into_string() }, Test { input: "The quick brown fox jumps over the lazy \ - dog.".to_string(), + dog.".into_string(), output_str: "ef537f25c895bfa78252\ - 6529a9b63d97aa631564d5d789c2b765448c8635fb6c".to_string() + 6529a9b63d97aa631564d5d789c2b765448c8635fb6c".into_string() }); let tests = wikipedia_tests; diff --git a/src/librustc_back/target/apple_base.rs b/src/librustc_back/target/apple_base.rs index 795a2c18bc6e6..c6888745ca961 100644 --- a/src/librustc_back/target/apple_base.rs +++ b/src/librustc_back/target/apple_base.rs @@ -15,14 +15,14 @@ pub fn opts() -> TargetOptions { TargetOptions { // OSX has -dead_strip, which doesn't rely on ffunction_sections function_sections: false, - linker: "cc".to_string(), + linker: "cc".into_string(), dynamic_linking: true, executables: true, is_like_osx: true, morestack: true, has_rpath: true, - dll_prefix: "lib".to_string(), - dll_suffix: ".dylib".to_string(), + dll_prefix: "lib".into_string(), + dll_suffix: ".dylib".into_string(), pre_link_args: Vec::new(), .. Default::default() } diff --git a/src/librustc_back/target/arm_apple_ios.rs b/src/librustc_back/target/arm_apple_ios.rs index 8be98a517757f..3677ae62e0021 100644 --- a/src/librustc_back/target/arm_apple_ios.rs +++ b/src/librustc_back/target/arm_apple_ios.rs @@ -16,14 +16,14 @@ pub fn target() -> Target { -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string(), - llvm_target: "arm-apple-ios".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "arm".to_string(), - target_os: "ios".to_string(), + -a0:0:64-n32".into_string(), + llvm_target: "arm-apple-ios".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "arm".into_string(), + target_os: "ios".into_string(), options: TargetOptions { - features: "+v7,+thumb2,+vfp3,+neon".to_string(), + features: "+v7,+thumb2,+vfp3,+neon".into_string(), executables: false, dynamic_linking: false, // Although there is an experimental implementation of LLVM which diff --git a/src/librustc_back/target/arm_linux_androideabi.rs b/src/librustc_back/target/arm_linux_androideabi.rs index 97bc747916d03..eb004802731cc 100644 --- a/src/librustc_back/target/arm_linux_androideabi.rs +++ b/src/librustc_back/target/arm_linux_androideabi.rs @@ -12,10 +12,10 @@ use target::Target; pub fn target() -> Target { let mut base = super::linux_base::opts(); - base.features = "+v7".to_string(); + base.features = "+v7".into_string(); // Many of the symbols defined in compiler-rt are also defined in libgcc. Android // linker doesn't like that by default. - base.pre_link_args.push("-Wl,--allow-multiple-definition".to_string()); + base.pre_link_args.push("-Wl,--allow-multiple-definition".into_string()); // FIXME #17437 (and #17448): Android doesn't support position dependant executables anymore. base.position_independent_executables = false; @@ -24,12 +24,12 @@ pub fn target() -> Target { -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string(), - llvm_target: "arm-linux-androideabi".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "arm".to_string(), - target_os: "android".to_string(), + -a0:0:64-n32".into_string(), + llvm_target: "arm-linux-androideabi".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "arm".into_string(), + target_os: "android".into_string(), options: base, } } diff --git a/src/librustc_back/target/arm_unknown_linux_gnueabi.rs b/src/librustc_back/target/arm_unknown_linux_gnueabi.rs index aecab18826419..5df8bfa4b34e3 100644 --- a/src/librustc_back/target/arm_unknown_linux_gnueabi.rs +++ b/src/librustc_back/target/arm_unknown_linux_gnueabi.rs @@ -17,15 +17,15 @@ pub fn target() -> Target { -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string(), - llvm_target: "arm-unknown-linux-gnueabi".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "arm".to_string(), - target_os: "linux".to_string(), + -a0:0:64-n32".into_string(), + llvm_target: "arm-unknown-linux-gnueabi".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "arm".into_string(), + target_os: "linux".into_string(), options: TargetOptions { - features: "+v6".to_string(), + features: "+v6".into_string(), .. base }, } diff --git a/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs b/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs index 305862d357a49..794c6c3aa3c90 100644 --- a/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs +++ b/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs @@ -17,15 +17,15 @@ pub fn target() -> Target { -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string(), - llvm_target: "arm-unknown-linux-gnueabihf".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "arm".to_string(), - target_os: "linux".to_string(), + -a0:0:64-n32".into_string(), + llvm_target: "arm-unknown-linux-gnueabihf".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "arm".into_string(), + target_os: "linux".into_string(), options: TargetOptions { - features: "+v6,+vfp2".to_string(), + features: "+v6,+vfp2".into_string(), .. base } } diff --git a/src/librustc_back/target/dragonfly_base.rs b/src/librustc_back/target/dragonfly_base.rs index 4e982b2b76eba..f4582955728e0 100644 --- a/src/librustc_back/target/dragonfly_base.rs +++ b/src/librustc_back/target/dragonfly_base.rs @@ -13,15 +13,15 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), + linker: "cc".into_string(), dynamic_linking: true, executables: true, morestack: true, has_rpath: true, pre_link_args: vec!( - "-L/usr/local/lib".to_string(), - "-L/usr/local/lib/gcc47".to_string(), - "-L/usr/local/lib/gcc44".to_string(), + "-L/usr/local/lib".into_string(), + "-L/usr/local/lib/gcc47".into_string(), + "-L/usr/local/lib/gcc44".into_string(), ), .. Default::default() diff --git a/src/librustc_back/target/freebsd_base.rs b/src/librustc_back/target/freebsd_base.rs index ab8398fc60511..905a26352fa76 100644 --- a/src/librustc_back/target/freebsd_base.rs +++ b/src/librustc_back/target/freebsd_base.rs @@ -13,15 +13,15 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), + linker: "cc".into_string(), dynamic_linking: true, executables: true, morestack: true, has_rpath: true, pre_link_args: vec!( - "-L/usr/local/lib".to_string(), - "-L/usr/local/lib/gcc46".to_string(), - "-L/usr/local/lib/gcc44".to_string(), + "-L/usr/local/lib".into_string(), + "-L/usr/local/lib/gcc46".into_string(), + "-L/usr/local/lib/gcc44".into_string(), ), .. Default::default() diff --git a/src/librustc_back/target/i386_apple_ios.rs b/src/librustc_back/target/i386_apple_ios.rs index fe336601a81ac..a47309ae4f7ee 100644 --- a/src/librustc_back/target/i386_apple_ios.rs +++ b/src/librustc_back/target/i386_apple_ios.rs @@ -16,12 +16,12 @@ pub fn target() -> Target { -i32:32:32-i64:32:64\ -f32:32:32-f64:32:64-v64:64:64\ -v128:128:128-a0:0:64-f80:128:128\ - -n8:16:32".to_string(), - llvm_target: "i386-apple-ios".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "x86".to_string(), - target_os: "ios".to_string(), + -n8:16:32".into_string(), + llvm_target: "i386-apple-ios".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "x86".into_string(), + target_os: "ios".into_string(), options: super::apple_base::opts() } diff --git a/src/librustc_back/target/i686_apple_darwin.rs b/src/librustc_back/target/i686_apple_darwin.rs index bd3dd3246aa6d..c7b73481a224a 100644 --- a/src/librustc_back/target/i686_apple_darwin.rs +++ b/src/librustc_back/target/i686_apple_darwin.rs @@ -12,19 +12,19 @@ use target::Target; pub fn target() -> Target { let mut base = super::apple_base::opts(); - base.pre_link_args.push("-m32".to_string()); + base.pre_link_args.push("-m32".into_string()); Target { data_layout: "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16\ -i32:32:32-i64:32:64\ -f32:32:32-f64:32:64-v64:64:64\ -v128:128:128-a0:0:64-f80:128:128\ - -n8:16:32".to_string(), - llvm_target: "i686-apple-darwin".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "x86".to_string(), - target_os: "macos".to_string(), + -n8:16:32".into_string(), + llvm_target: "i686-apple-darwin".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "x86".into_string(), + target_os: "macos".into_string(), options: base, } } diff --git a/src/librustc_back/target/i686_pc_windows_gnu.rs b/src/librustc_back/target/i686_pc_windows_gnu.rs index 4d75590e6647c..7dccb7cdf34cb 100644 --- a/src/librustc_back/target/i686_pc_windows_gnu.rs +++ b/src/librustc_back/target/i686_pc_windows_gnu.rs @@ -15,20 +15,20 @@ pub fn target() -> Target { // Mark all dynamic libraries and executables as compatible with the larger 4GiB address // space available to x86 Windows binaries on x86_64. - options.pre_link_args.push("-Wl,--large-address-aware".to_string()); + options.pre_link_args.push("-Wl,--large-address-aware".into_string()); // Make sure that we link to the dynamic libgcc, otherwise cross-module // DWARF stack unwinding will not work. // This behavior may be overridden by -Clink-args="-static-libgcc" - options.pre_link_args.push("-shared-libgcc".to_string()); + options.pre_link_args.push("-shared-libgcc".into_string()); Target { - data_layout: "e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32".to_string(), - llvm_target: "i686-pc-windows-gnu".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "x86".to_string(), - target_os: "windows".to_string(), + data_layout: "e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32".into_string(), + llvm_target: "i686-pc-windows-gnu".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "x86".into_string(), + target_os: "windows".into_string(), options: options, } } diff --git a/src/librustc_back/target/i686_unknown_dragonfly.rs b/src/librustc_back/target/i686_unknown_dragonfly.rs index a12657ff4dcdc..d548836245d1e 100644 --- a/src/librustc_back/target/i686_unknown_dragonfly.rs +++ b/src/librustc_back/target/i686_unknown_dragonfly.rs @@ -12,15 +12,15 @@ use target::Target; pub fn target() -> Target { let mut base = super::dragonfly_base::opts(); - base.pre_link_args.push("-m32".to_string()); + base.pre_link_args.push("-m32".into_string()); Target { - data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string(), - llvm_target: "i686-unknown-dragonfly".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "x86".to_string(), - target_os: "dragonfly".to_string(), + data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string(), + llvm_target: "i686-unknown-dragonfly".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "x86".into_string(), + target_os: "dragonfly".into_string(), options: base, } } diff --git a/src/librustc_back/target/i686_unknown_linux_gnu.rs b/src/librustc_back/target/i686_unknown_linux_gnu.rs index 1a4560d5cd5fc..50b92ffb33147 100644 --- a/src/librustc_back/target/i686_unknown_linux_gnu.rs +++ b/src/librustc_back/target/i686_unknown_linux_gnu.rs @@ -12,15 +12,15 @@ use target::Target; pub fn target() -> Target { let mut base = super::linux_base::opts(); - base.pre_link_args.push("-m32".to_string()); + base.pre_link_args.push("-m32".into_string()); Target { - data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string(), - llvm_target: "i686-unknown-linux-gnu".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "x86".to_string(), - target_os: "linux".to_string(), + data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string(), + llvm_target: "i686-unknown-linux-gnu".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "x86".into_string(), + target_os: "linux".into_string(), options: base, } } diff --git a/src/librustc_back/target/linux_base.rs b/src/librustc_back/target/linux_base.rs index d267bc77e4975..87990ec881962 100644 --- a/src/librustc_back/target/linux_base.rs +++ b/src/librustc_back/target/linux_base.rs @@ -13,7 +13,7 @@ use std::default::Default; pub fn opts() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), + linker: "cc".into_string(), dynamic_linking: true, executables: true, morestack: true, @@ -23,7 +23,7 @@ pub fn opts() -> TargetOptions { // GNU-style linkers will use this to omit linking to libraries which // don't actually fulfill any relocations, but only for libraries which // follow this flag. Thus, use it before specifying libraries to link to. - "-Wl,--as-needed".to_string(), + "-Wl,--as-needed".into_string(), ), position_independent_executables: true, .. Default::default() diff --git a/src/librustc_back/target/mips_unknown_linux_gnu.rs b/src/librustc_back/target/mips_unknown_linux_gnu.rs index 45e02ecb98ca6..e03a05fc6c9f1 100644 --- a/src/librustc_back/target/mips_unknown_linux_gnu.rs +++ b/src/librustc_back/target/mips_unknown_linux_gnu.rs @@ -16,12 +16,12 @@ pub fn target() -> Target { -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string(), - llvm_target: "mips-unknown-linux-gnu".to_string(), - target_endian: "big".to_string(), - target_word_size: "32".to_string(), - arch: "mips".to_string(), - target_os: "linux".to_string(), + -a0:0:64-n32".into_string(), + llvm_target: "mips-unknown-linux-gnu".into_string(), + target_endian: "big".into_string(), + target_word_size: "32".into_string(), + arch: "mips".into_string(), + target_os: "linux".into_string(), options: super::linux_base::opts() } } diff --git a/src/librustc_back/target/mipsel_unknown_linux_gnu.rs b/src/librustc_back/target/mipsel_unknown_linux_gnu.rs index 1ba99b167c30a..bb82ba54fbdc5 100644 --- a/src/librustc_back/target/mipsel_unknown_linux_gnu.rs +++ b/src/librustc_back/target/mipsel_unknown_linux_gnu.rs @@ -16,12 +16,12 @@ pub fn target() -> Target { -i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64\ -f32:32:32-f64:64:64\ -v64:64:64-v128:64:128\ - -a0:0:64-n32".to_string(), - llvm_target: "mipsel-unknown-linux-gnu".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "mips".to_string(), - target_os: "linux".to_string(), + -a0:0:64-n32".into_string(), + llvm_target: "mipsel-unknown-linux-gnu".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "mips".into_string(), + target_os: "linux".into_string(), options: super::linux_base::opts() } diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 76adc4e472f82..8248ee1f84323 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -167,24 +167,24 @@ impl Default for TargetOptions { /// compilation, will certainly not work. fn default() -> TargetOptions { TargetOptions { - linker: "cc".to_string(), + linker: "cc".into_string(), pre_link_args: Vec::new(), post_link_args: Vec::new(), - cpu: "generic".to_string(), - features: "".to_string(), + cpu: "generic".into_string(), + features: "".into_string(), dynamic_linking: false, executables: false, morestack: false, - relocation_model: "pic".to_string(), - code_model: "default".to_string(), + relocation_model: "pic".into_string(), + code_model: "default".into_string(), disable_redzone: false, eliminate_frame_pointer: true, function_sections: true, - dll_prefix: "lib".to_string(), - dll_suffix: ".so".to_string(), - exe_suffix: "".to_string(), - staticlib_prefix: "lib".to_string(), - staticlib_suffix: ".a".to_string(), + dll_prefix: "lib".into_string(), + dll_suffix: ".so".into_string(), + exe_suffix: "".into_string(), + staticlib_prefix: "lib".into_string(), + staticlib_suffix: ".a".into_string(), is_like_osx: false, is_like_windows: false, linker_is_gnu: false, diff --git a/src/librustc_back/target/windows_base.rs b/src/librustc_back/target/windows_base.rs index 148be8cab76e3..cef756df119fb 100644 --- a/src/librustc_back/target/windows_base.rs +++ b/src/librustc_back/target/windows_base.rs @@ -15,14 +15,14 @@ pub fn opts() -> TargetOptions { TargetOptions { // FIXME(#13846) this should be enabled for windows function_sections: false, - linker: "gcc".to_string(), + linker: "gcc".into_string(), dynamic_linking: true, executables: true, - dll_prefix: "".to_string(), - dll_suffix: ".dll".to_string(), - exe_suffix: ".exe".to_string(), - staticlib_prefix: "".to_string(), - staticlib_suffix: ".lib".to_string(), + dll_prefix: "".into_string(), + dll_suffix: ".dll".into_string(), + exe_suffix: ".exe".into_string(), + staticlib_prefix: "".into_string(), + staticlib_suffix: ".lib".into_string(), morestack: false, is_like_windows: true, pre_link_args: vec!( @@ -51,14 +51,14 @@ pub fn opts() -> TargetOptions { // // [1] - https://sourceware.org/bugzilla/show_bug.cgi?id=13130 // [2] - https://code.google.com/p/go/issues/detail?id=2139 - "-Wl,--enable-long-section-names".to_string(), + "-Wl,--enable-long-section-names".into_string(), // Tell GCC to avoid linker plugins, because we are not bundling // them with Windows installer, and Rust does its own LTO anyways. - "-fno-use-linker-plugin".to_string(), + "-fno-use-linker-plugin".into_string(), // Always enable DEP (NX bit) when it is available - "-Wl,--nxcompat".to_string(), + "-Wl,--nxcompat".into_string(), ), .. Default::default() diff --git a/src/librustc_back/target/x86_64_apple_darwin.rs b/src/librustc_back/target/x86_64_apple_darwin.rs index 4e958d73a39da..763732ede045f 100644 --- a/src/librustc_back/target/x86_64_apple_darwin.rs +++ b/src/librustc_back/target/x86_64_apple_darwin.rs @@ -13,17 +13,17 @@ use target::Target; pub fn target() -> Target { let mut base = super::apple_base::opts(); base.eliminate_frame_pointer = false; - base.pre_link_args.push("-m64".to_string()); + base.pre_link_args.push("-m64".into_string()); Target { data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64".to_string(), - llvm_target: "x86_64-apple-darwin".to_string(), - target_endian: "little".to_string(), - target_word_size: "64".to_string(), - arch: "x86_64".to_string(), - target_os: "macos".to_string(), + s0:64:64-f80:128:128-n8:16:32:64".into_string(), + llvm_target: "x86_64-apple-darwin".into_string(), + target_endian: "little".into_string(), + target_word_size: "64".into_string(), + arch: "x86_64".into_string(), + target_os: "macos".into_string(), options: base, } } diff --git a/src/librustc_back/target/x86_64_pc_windows_gnu.rs b/src/librustc_back/target/x86_64_pc_windows_gnu.rs index 9247e1da0a58d..55c0d5bbf04e5 100644 --- a/src/librustc_back/target/x86_64_pc_windows_gnu.rs +++ b/src/librustc_back/target/x86_64_pc_windows_gnu.rs @@ -13,19 +13,19 @@ use target::Target; pub fn target() -> Target { let mut base = super::windows_base::opts(); // On Win64 unwinding is handled by the OS, so we can link libgcc statically. - base.pre_link_args.push("-static-libgcc".to_string()); - base.pre_link_args.push("-m64".to_string()); + base.pre_link_args.push("-static-libgcc".into_string()); + base.pre_link_args.push("-m64".into_string()); Target { // FIXME: Test this. Copied from linux (#2398) data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(), - llvm_target: "x86_64-pc-windows-gnu".to_string(), - target_endian: "little".to_string(), - target_word_size: "64".to_string(), - arch: "x86_64".to_string(), - target_os: "windows".to_string(), + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string(), + llvm_target: "x86_64-pc-windows-gnu".into_string(), + target_endian: "little".into_string(), + target_word_size: "64".into_string(), + arch: "x86_64".into_string(), + target_os: "windows".into_string(), options: base, } } diff --git a/src/librustc_back/target/x86_64_unknown_dragonfly.rs b/src/librustc_back/target/x86_64_unknown_dragonfly.rs index 79f09a3b00bdb..886232b06bb4d 100644 --- a/src/librustc_back/target/x86_64_unknown_dragonfly.rs +++ b/src/librustc_back/target/x86_64_unknown_dragonfly.rs @@ -12,12 +12,12 @@ use target::Target; pub fn target() -> Target { Target { - data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string(), - llvm_target: "x86_64-unknown-dragonfly".to_string(), - target_endian: "little".to_string(), - target_word_size: "32".to_string(), - arch: "x86_64".to_string(), - target_os: "dragonfly".to_string(), + data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string(), + llvm_target: "x86_64-unknown-dragonfly".into_string(), + target_endian: "little".into_string(), + target_word_size: "32".into_string(), + arch: "x86_64".into_string(), + target_os: "dragonfly".into_string(), options: super::dragonfly_base::opts() } } diff --git a/src/librustc_back/target/x86_64_unknown_freebsd.rs b/src/librustc_back/target/x86_64_unknown_freebsd.rs index 37801f3bf2519..fd2deb7d96799 100644 --- a/src/librustc_back/target/x86_64_unknown_freebsd.rs +++ b/src/librustc_back/target/x86_64_unknown_freebsd.rs @@ -12,17 +12,17 @@ use target::Target; pub fn target() -> Target { let mut base = super::freebsd_base::opts(); - base.pre_link_args.push("-m64".to_string()); + base.pre_link_args.push("-m64".into_string()); Target { data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(), - llvm_target: "x86_64-unknown-freebsd".to_string(), - target_endian: "little".to_string(), - target_word_size: "64".to_string(), - arch: "x86_64".to_string(), - target_os: "freebsd".to_string(), + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string(), + llvm_target: "x86_64-unknown-freebsd".into_string(), + target_endian: "little".into_string(), + target_word_size: "64".into_string(), + arch: "x86_64".into_string(), + target_os: "freebsd".into_string(), options: base, } } diff --git a/src/librustc_back/target/x86_64_unknown_linux_gnu.rs b/src/librustc_back/target/x86_64_unknown_linux_gnu.rs index ac04e6e14ba5c..40225bbd9f1e3 100644 --- a/src/librustc_back/target/x86_64_unknown_linux_gnu.rs +++ b/src/librustc_back/target/x86_64_unknown_linux_gnu.rs @@ -12,17 +12,17 @@ use target::Target; pub fn target() -> Target { let mut base = super::linux_base::opts(); - base.pre_link_args.push("-m64".to_string()); + base.pre_link_args.push("-m64".into_string()); Target { data_layout: "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string(), - llvm_target: "x86_64-unknown-linux-gnu".to_string(), - target_endian: "little".to_string(), - target_word_size: "64".to_string(), - arch: "x86_64".to_string(), - target_os: "linux".to_string(), + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string(), + llvm_target: "x86_64-unknown-linux-gnu".into_string(), + target_endian: "little".into_string(), + target_word_size: "64".into_string(), + arch: "x86_64".into_string(), + target_os: "linux".into_string(), options: base, } } diff --git a/src/librustc_back/x86.rs b/src/librustc_back/x86.rs index 21c4fd424748f..46e0cbc590f06 100644 --- a/src/librustc_back/x86.rs +++ b/src/librustc_back/x86.rs @@ -15,7 +15,7 @@ use syntax::abi; pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t { return target_strs::t { - module_asm: "".to_string(), + module_asm: "".into_string(), data_layout: match target_os { abi::OsMacos => { @@ -23,7 +23,7 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -i32:32:32-i64:32:64\ -f32:32:32-f64:32:64-v64:64:64\ -v128:128:128-a0:0:64-f80:128:128\ - -n8:16:32".to_string() + -n8:16:32".into_string() } abi::OsiOS => { @@ -31,31 +31,31 @@ pub fn get_target_strs(target_triple: String, target_os: abi::Os) -i32:32:32-i64:32:64\ -f32:32:32-f64:32:64-v64:64:64\ -v128:128:128-a0:0:64-f80:128:128\ - -n8:16:32".to_string() + -n8:16:32".into_string() } abi::OsWindows => { - "e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32".to_string() + "e-p:32:32-f64:64:64-i64:64:64-f80:32:32-n8:16:32".into_string() } abi::OsLinux => { - "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string() + "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string() } abi::OsAndroid => { - "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string() + "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string() } abi::OsFreebsd => { - "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string() + "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string() } abi::OsDragonfly => { - "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string() + "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".into_string() } }, target_triple: target_triple, - cc_args: vec!("-m32".to_string()), + cc_args: vec!("-m32".into_string()), }; } diff --git a/src/librustc_back/x86_64.rs b/src/librustc_back/x86_64.rs index 88cd6743192fd..fae8055667b55 100644 --- a/src/librustc_back/x86_64.rs +++ b/src/librustc_back/x86_64.rs @@ -14,54 +14,54 @@ use syntax::abi; pub fn get_target_strs(target_triple: String, target_os: abi::Os) -> target_strs::t { return target_strs::t { - module_asm: "".to_string(), + module_asm: "".into_string(), data_layout: match target_os { abi::OsMacos => { "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64".to_string() + s0:64:64-f80:128:128-n8:16:32:64".into_string() } abi::OsiOS => { "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64".to_string() + s0:64:64-f80:128:128-n8:16:32:64".into_string() } abi::OsWindows => { // FIXME: Test this. Copied from Linux (#2398) "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string() + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string() } abi::OsLinux => { "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string() + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string() } abi::OsAndroid => { "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string() + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string() } abi::OsFreebsd => { "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string() + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string() } abi::OsDragonfly => { "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-\ f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-\ - s0:64:64-f80:128:128-n8:16:32:64-S128".to_string() + s0:64:64-f80:128:128-n8:16:32:64-S128".into_string() } }, target_triple: target_triple, - cc_args: vec!("-m64".to_string()), + cc_args: vec!("-m64".into_string()), }; } diff --git a/src/librustc_driver/driver.rs b/src/librustc_driver/driver.rs index 749bed15e38e0..3acb59905eafd 100644 --- a/src/librustc_driver/driver.rs +++ b/src/librustc_driver/driver.rs @@ -102,7 +102,7 @@ pub fn compile_input(sess: Session, /// The name used for source code that doesn't originate in a file /// (e.g. source from stdin or a string) pub fn anon_src() -> String { - "".to_string() + "".into_string() } pub fn source_name(input: &Input) -> String { @@ -173,7 +173,7 @@ pub fn phase_2_configure_and_expand(sess: &Session, sess.add_lint(lint::builtin::UNKNOWN_FEATURES, ast::CRATE_NODE_ID, *uf, - "unknown feature".to_string()); + "unknown feature".into_string()); } sess.abort_if_errors(); @@ -654,7 +654,7 @@ pub fn collect_crate_types(session: &Session, ast::CRATE_NODE_ID, a.span, "invalid `crate_type` \ - value".to_string()); + value".into_string()); None } _ => { @@ -662,7 +662,7 @@ pub fn collect_crate_types(session: &Session, ast::CRATE_NODE_ID, a.span, "`crate_type` requires a \ - value".to_string()); + value".into_string()); None } } diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs index 7f15f5e87d9dd..baa33989038f7 100644 --- a/src/librustc_driver/lib.rs +++ b/src/librustc_driver/lib.rs @@ -146,7 +146,7 @@ fn run_compiler(args: &[String]) { } let r = matches.opt_strs("Z"); - if r.contains(&("ls".to_string())) { + if r.contains(&("ls".into_string())) { match input { Input::File(ref ifile) => { let mut stdout = io::stdout(); @@ -389,7 +389,7 @@ pub fn handle_options(mut args: Vec) -> Option { return None; } - if cg_flags.contains(&"passes=list".to_string()) { + if cg_flags.contains(&"passes=list".into_string()) { unsafe { ::llvm::LLVMRustPrintPasses(); } return None; } @@ -502,10 +502,10 @@ pub fn monitor(f: proc():Send) { } let xs = [ - "the compiler unexpectedly panicked. this is a bug.".to_string(), + "the compiler unexpectedly panicked. this is a bug.".into_string(), format!("we would appreciate a bug report: {}", BUG_REPORT_URL), - "run with `RUST_BACKTRACE=1` for a backtrace".to_string(), + "run with `RUST_BACKTRACE=1` for a backtrace".into_string(), ]; for note in xs.iter() { emitter.emit(None, note.as_slice(), None, diagnostic::Note) diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs index 62f8177ed758d..33edc14a67478 100644 --- a/src/librustc_trans/back/link.rs +++ b/src/librustc_trans/back/link.rs @@ -160,7 +160,7 @@ pub fn find_crate_name(sess: Option<&Session>, } } - "rust-out".to_string() + "rust-out".into_string() } pub fn build_link_meta(sess: &Session, krate: &ast::Crate, diff --git a/src/librustc_trans/back/write.rs b/src/librustc_trans/back/write.rs index 0ed6ae311711f..0c56528692cf4 100644 --- a/src/librustc_trans/back/write.rs +++ b/src/librustc_trans/back/write.rs @@ -71,7 +71,7 @@ pub fn write_output_file( let result = llvm::LLVMRustWriteOutputFile( target, pm, m, output, file_type); if !result { - llvm_err(handler, "could not write output".to_string()); + llvm_err(handler, "could not write output".into_string()); } }) } @@ -620,7 +620,7 @@ pub fn run_passes(sess: &Session, trans.metadata_module, metadata_config.clone(), crate_output.clone(), - "metadata".to_string()); + "metadata".into_string()); work_items.push(work); } diff --git a/src/librustc_trans/save/mod.rs b/src/librustc_trans/save/mod.rs index 2a698a898fe87..3487df7ac2f44 100644 --- a/src/librustc_trans/save/mod.rs +++ b/src/librustc_trans/save/mod.rs @@ -1391,7 +1391,7 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DxrVisitor<'l, 'tcx> { let value = if *immut { self.span.snippet(p.span).into_string() } else { - "".to_string() + "".into_string() }; let sub_span = self.span.span_for_first_ident(p.span); let def_map = self.analysis.ty_cx.def_map.borrow(); @@ -1448,7 +1448,7 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DxrVisitor<'l, 'tcx> { let value = self.span.snippet(l.span); for &(id, ref p, ref immut, _) in self.collected_paths.iter() { - let value = if *immut { value.to_string() } else { "".to_string() }; + let value = if *immut { value.to_string() } else { "".into_string() }; let types = self.analysis.ty_cx.node_types.borrow(); let typ = ppaux::ty_to_string(&self.analysis.ty_cx, (*types)[id]); // Get the span only for the name of the variable (I hope the path diff --git a/src/librustc_trans/save/recorder.rs b/src/librustc_trans/save/recorder.rs index c15ff1d7f0a9d..a641c53fc8e0f 100644 --- a/src/librustc_trans/save/recorder.rs +++ b/src/librustc_trans/save/recorder.rs @@ -532,7 +532,7 @@ impl<'a> FmtStrs<'a> { }; let (dcn, dck) = match declid { Some(declid) => (s!(declid.node), s!(declid.krate)), - None => ("".to_string(), "".to_string()) + None => ("".into_string(), "".into_string()) }; self.check_and_record(MethodCall, span, diff --git a/src/librustc_trans/trans/asm.rs b/src/librustc_trans/trans/asm.rs index e3afe22897e39..abac38a188b05 100644 --- a/src/librustc_trans/trans/asm.rs +++ b/src/librustc_trans/trans/asm.rs @@ -168,10 +168,10 @@ pub fn trans_inline_asm<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, ia: &ast::InlineAsm) target_arch = "mips", target_arch = "mipsel"))] fn get_clobbers() -> String { - "".to_string() + "".into_string() } #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] fn get_clobbers() -> String { - "~{dirflag},~{fpsr},~{flags}".to_string() + "~{dirflag},~{fpsr},~{flags}".into_string() } diff --git a/src/librustc_trans/trans/base.rs b/src/librustc_trans/trans/base.rs index cef12616cf267..f18c820eb6571 100644 --- a/src/librustc_trans/trans/base.rs +++ b/src/librustc_trans/trans/base.rs @@ -1433,7 +1433,7 @@ pub fn new_fn_ctxt<'a, 'tcx>(ccx: &'a CrateContext<'a, 'tcx>, debug!("new_fn_ctxt(path={}, id={}, param_substs={})", if id == -1 { - "".to_string() + "".into_string() } else { ccx.tcx().map.path_to_string(id).to_string() }, @@ -3176,13 +3176,13 @@ pub fn trans_crate<'tcx>(analysis: ty::CrateAnalysis<'tcx>) // symbol. This symbol is required for use by the libmorestack library that // we link in, so we must ensure that this symbol is not internalized (if // defined in the crate). - reachable.push("main".to_string()); - reachable.push("rust_stack_exhausted".to_string()); + reachable.push("main".into_string()); + reachable.push("rust_stack_exhausted".into_string()); // referenced from .eh_frame section on some platforms - reachable.push("rust_eh_personality".to_string()); + reachable.push("rust_eh_personality".into_string()); // referenced from rt/rust_try.ll - reachable.push("rust_eh_personality_catch".to_string()); + reachable.push("rust_eh_personality_catch".into_string()); if codegen_units > 1 { internalize_symbols(&shared_ccx, &reachable.iter().map(|x| x.clone()).collect()); diff --git a/src/librustc_trans/trans/callee.rs b/src/librustc_trans/trans/callee.rs index ff7ab91c39a58..5a5dac885d0a0 100644 --- a/src/librustc_trans/trans/callee.rs +++ b/src/librustc_trans/trans/callee.rs @@ -616,7 +616,7 @@ pub fn trans_fn_ref_with_substs<'blk, 'tcx>( let map_node = session::expect( ccx.sess(), tcx.map.find(def_id.node), - || "local item should be in ast map".to_string()); + || "local item should be in ast map".into_string()); match map_node { ast_map::NodeVariant(v) => match v.node.kind { diff --git a/src/librustc_trans/trans/debuginfo.rs b/src/librustc_trans/trans/debuginfo.rs index f6c4ba64576f7..8f2f694a8856d 100644 --- a/src/librustc_trans/trans/debuginfo.rs +++ b/src/librustc_trans/trans/debuginfo.rs @@ -1753,26 +1753,26 @@ fn basic_type_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, let (name, encoding) = match t.sty { ty::ty_tup(ref elements) if elements.is_empty() => - ("()".to_string(), DW_ATE_unsigned), - ty::ty_bool => ("bool".to_string(), DW_ATE_boolean), - ty::ty_char => ("char".to_string(), DW_ATE_unsigned_char), + ("()".into_string(), DW_ATE_unsigned), + ty::ty_bool => ("bool".into_string(), DW_ATE_boolean), + ty::ty_char => ("char".into_string(), DW_ATE_unsigned_char), ty::ty_int(int_ty) => match int_ty { - ast::TyI => ("int".to_string(), DW_ATE_signed), - ast::TyI8 => ("i8".to_string(), DW_ATE_signed), - ast::TyI16 => ("i16".to_string(), DW_ATE_signed), - ast::TyI32 => ("i32".to_string(), DW_ATE_signed), - ast::TyI64 => ("i64".to_string(), DW_ATE_signed) + ast::TyI => ("int".into_string(), DW_ATE_signed), + ast::TyI8 => ("i8".into_string(), DW_ATE_signed), + ast::TyI16 => ("i16".into_string(), DW_ATE_signed), + ast::TyI32 => ("i32".into_string(), DW_ATE_signed), + ast::TyI64 => ("i64".into_string(), DW_ATE_signed) }, ty::ty_uint(uint_ty) => match uint_ty { - ast::TyU => ("uint".to_string(), DW_ATE_unsigned), - ast::TyU8 => ("u8".to_string(), DW_ATE_unsigned), - ast::TyU16 => ("u16".to_string(), DW_ATE_unsigned), - ast::TyU32 => ("u32".to_string(), DW_ATE_unsigned), - ast::TyU64 => ("u64".to_string(), DW_ATE_unsigned) + ast::TyU => ("uint".into_string(), DW_ATE_unsigned), + ast::TyU8 => ("u8".into_string(), DW_ATE_unsigned), + ast::TyU16 => ("u16".into_string(), DW_ATE_unsigned), + ast::TyU32 => ("u32".into_string(), DW_ATE_unsigned), + ast::TyU64 => ("u64".into_string(), DW_ATE_unsigned) }, ty::ty_float(float_ty) => match float_ty { - ast::TyF32 => ("f32".to_string(), DW_ATE_float), - ast::TyF64 => ("f64".to_string(), DW_ATE_float), + ast::TyF32 => ("f32".into_string(), DW_ATE_float), + ast::TyF64 => ("f64".into_string(), DW_ATE_float), }, _ => cx.sess().bug("debuginfo::basic_type_metadata - t is invalid type") }; @@ -1974,7 +1974,7 @@ impl<'tcx> StructMemberDescriptionFactory<'tcx> { self.fields.iter().enumerate().map(|(i, field)| { let name = if field.name == special_idents::unnamed_field.name { - "".to_string() + "".into_string() } else { token::get_name(field.name).get().to_string() }; @@ -2048,7 +2048,7 @@ impl<'tcx> TupleMemberDescriptionFactory<'tcx> { -> Vec { self.component_types.iter().map(|&component_type| { MemberDescription { - name: "".to_string(), + name: "".into_string(), llvm_type: type_of::type_of(cx, component_type), type_metadata: type_metadata(cx, component_type, self.span), offset: ComputedMemberOffset, @@ -2135,7 +2135,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> { variant_llvm_type, member_descriptions.as_slice()); MemberDescription { - name: "".to_string(), + name: "".into_string(), llvm_type: variant_llvm_type, type_metadata: variant_type_metadata, offset: FixedMemberOffset { bytes: 0 }, @@ -2169,7 +2169,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> { member_descriptions.as_slice()); vec![ MemberDescription { - name: "".to_string(), + name: "".into_string(), llvm_type: variant_llvm_type, type_metadata: variant_type_metadata, offset: FixedMemberOffset { bytes: 0 }, @@ -2201,7 +2201,7 @@ impl<'tcx> EnumMemberDescriptionFactory<'tcx> { let sole_struct_member_description = MemberDescription { name: match non_null_variant.arg_names { Some(ref names) => token::get_ident(names[0]).get().to_string(), - None => "".to_string() + None => "".into_string() }, llvm_type: non_null_llvm_type, type_metadata: non_null_type_metadata, @@ -2373,12 +2373,12 @@ fn describe_enum_variant<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, token::get_ident(*ident).get().to_string().into_string() }).collect() } - None => variant_info.args.iter().map(|_| "".to_string()).collect() + None => variant_info.args.iter().map(|_| "".into_string()).collect() }; // If this is not a univariant enum, there is also the discriminant field. match discriminant_info { - RegularDiscriminant(_) => arg_names.insert(0, "RUST$ENUM$DISR".to_string()), + RegularDiscriminant(_) => arg_names.insert(0, "RUST$ENUM$DISR".into_string()), _ => { /* do nothing */ } }; @@ -2746,14 +2746,14 @@ fn vec_slice_metadata<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, element_type)); let member_descriptions = [ MemberDescription { - name: "data_ptr".to_string(), + name: "data_ptr".into_string(), llvm_type: member_llvm_types[0], type_metadata: element_type_metadata, offset: ComputedMemberOffset, flags: FLAGS_NONE }, MemberDescription { - name: "length".to_string(), + name: "length".into_string(), llvm_type: member_llvm_types[1], type_metadata: type_metadata(cx, ty::mk_uint(), span), offset: ComputedMemberOffset, diff --git a/src/librustc_trans/trans/expr.rs b/src/librustc_trans/trans/expr.rs index e3e6fff723410..11d995a3a9ac9 100644 --- a/src/librustc_trans/trans/expr.rs +++ b/src/librustc_trans/trans/expr.rs @@ -85,7 +85,7 @@ impl Dest { pub fn to_string(&self, ccx: &CrateContext) -> String { match *self { SaveIn(v) => format!("SaveIn({})", ccx.tn().val_to_string(v)), - Ignore => "Ignore".to_string() + Ignore => "Ignore".into_string() } } } diff --git a/src/librustc_trans/trans/foreign.rs b/src/librustc_trans/trans/foreign.rs index 615d5467f8464..a707c7c785ba5 100644 --- a/src/librustc_trans/trans/foreign.rs +++ b/src/librustc_trans/trans/foreign.rs @@ -142,7 +142,7 @@ pub fn register_static(ccx: &CrateContext, // linkage and there are no definitions), then // `extern_with_linkage_foo` will instead be initialized to // zero. - let mut real_name = "_rust_extern_with_linkage_".to_string(); + let mut real_name = "_rust_extern_with_linkage_".into_string(); real_name.push_str(ident.get()); let g2 = real_name.with_c_str(|buf| { llvm::LLVMAddGlobal(ccx.llmod(), llty.to_ref(), buf) diff --git a/src/librustc_trans/trans/type_of.rs b/src/librustc_trans/trans/type_of.rs index adc919c91bf36..e2db9f833acb6 100644 --- a/src/librustc_trans/trans/type_of.rs +++ b/src/librustc_trans/trans/type_of.rs @@ -459,7 +459,7 @@ pub fn llvm_type_name<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, let name = match what { a_struct => "struct", an_enum => "enum", - an_unboxed_closure => return "closure".to_string(), + an_unboxed_closure => return "closure".into_string(), }; let base = ty::item_path_str(cx.tcx(), did); diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs index 7dcf0aa3e2189..b3d47f9dd875b 100644 --- a/src/librustc_typeck/check/_match.rs +++ b/src/librustc_typeck/check/_match.rs @@ -50,7 +50,7 @@ pub fn check_pat<'a, 'tcx>(pcx: &pat_ctxt<'a, 'tcx>, let rhs_ty = fcx.expr_ty(&**end); if require_same_types( tcx, Some(fcx.infcx()), false, pat.span, lhs_ty, rhs_ty, - || "mismatched types in range".to_string()) + || "mismatched types in range".into_string()) && (ty::type_is_numeric(lhs_ty) || ty::type_is_char(rhs_ty)) { match valid_range_bounds(fcx.ccx, &**begin, &**end) { Some(false) => { diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 1a8b06ec12def..58acbd33be989 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -4629,7 +4629,7 @@ fn check_block_with_expected<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, .add_lint(lint::builtin::UNREACHABLE_CODE, s_id, s.span, - "unreachable statement".to_string()); + "unreachable statement".into_string()); warned = true; } any_diverges = any_diverges || fcx.infcx().type_var_diverges(s_ty); @@ -4651,7 +4651,7 @@ fn check_block_with_expected<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, .add_lint(lint::builtin::UNREACHABLE_CODE, e.id, e.span, - "unreachable expression".to_string()); + "unreachable expression".into_string()); } let ety = match expected { ExpectHasType(ety) => { @@ -5472,7 +5472,7 @@ pub fn structurally_resolved_type<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, sp: Span, if ty::type_is_ty_var(ty) { fcx.type_error_message(sp, |_actual| { "the type of this value must be known in this \ - context".to_string() + context".into_string() }, ty, None); demand::suptype(fcx, sp, ty::mk_err(), ty); ty = ty::mk_err(); diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index 3ee07df6ed447..7798d468ec88f 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -393,6 +393,6 @@ fn build_static(cx: &DocContext, tcx: &ty::ctxt, clean::Static { type_: ty::lookup_item_type(tcx, did).ty.clean(cx), mutability: if mutable {clean::Mutable} else {clean::Immutable}, - expr: "\n\n\n".to_string(), // trigger the "[definition]" links + expr: "\n\n\n".into_string(), // trigger the "[definition]" links } } diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index df7b922bd1abc..14b37229a7906 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -353,7 +353,7 @@ impl Clean for doctree::Module { let name = if self.name.is_some() { self.name.unwrap().clean(cx) } else { - "".to_string() + "".into_string() }; let mut foreigns = Vec::new(); for subforeigns in self.foreigns.clean(cx).into_iter() { @@ -646,7 +646,7 @@ impl Lifetime { } pub fn statik() -> Lifetime { - Lifetime("'static".to_string()) + Lifetime("'static".into_string()) } } @@ -925,7 +925,7 @@ impl<'a, 'tcx> Clean for (ast::DefId, &'a ty::FnSig<'tcx>) { Argument { type_: t.clean(cx), id: 0, - name: names.next().unwrap_or("".to_string()), + name: names.next().unwrap_or("".into_string()), } }).collect(), }, @@ -1649,7 +1649,7 @@ pub struct Span { impl Span { fn empty() -> Span { Span { - filename: "".to_string(), + filename: "".into_string(), loline: 0, locol: 0, hiline: 0, hicol: 0, } @@ -2030,7 +2030,7 @@ impl Clean for ast::PathListItem { source: resolve_def(cx, id) }, ast::PathListMod { id } => ViewListIdent { - name: "mod".to_string(), + name: "mod".into_string(), source: resolve_def(cx, id) } } @@ -2057,7 +2057,7 @@ impl Clean for ast::ForeignItem { ForeignStaticItem(Static { type_: ty.clean(cx), mutability: if mutbl {Mutable} else {Immutable}, - expr: "".to_string(), + expr: "".into_string(), }) } }; @@ -2084,7 +2084,7 @@ impl ToSource for syntax::codemap::Span { debug!("converting span {} to snippet", self.clean(cx)); let sn = match cx.sess().codemap().span_to_snippet(*self) { Some(x) => x.to_string(), - None => "".to_string() + None => "".into_string() }; debug!("got snippet {}", sn); sn @@ -2116,8 +2116,8 @@ fn name_from_pat(p: &ast::Pat) -> String { debug!("Trying to get a name from pattern: {}", p); match p.node { - PatWild(PatWildSingle) => "_".to_string(), - PatWild(PatWildMulti) => "..".to_string(), + PatWild(PatWildSingle) => "_".into_string(), + PatWild(PatWildMulti) => "..".into_string(), PatIdent(_, ref p, _) => token::get_ident(p.node).get().to_string(), PatEnum(ref p, _) => path_to_string(p), PatStruct(ref name, ref fields, etc) => { @@ -2135,7 +2135,7 @@ fn name_from_pat(p: &ast::Pat) -> String { PatLit(..) => { warn!("tried to get argument name from PatLit, \ which is silly in function arguments"); - "()".to_string() + "()".into_string() }, PatRange(..) => panic!("tried to get argument name from PatRange, \ which is not allowed in function arguments"), @@ -2144,7 +2144,7 @@ fn name_from_pat(p: &ast::Pat) -> String { PatMac(..) => { warn!("can't document the name of a function argument \ produced by a pattern macro"); - "(argument produced by macro)".to_string() + "(argument produced by macro)".into_string() } } } @@ -2260,7 +2260,7 @@ impl Clean for attr::Stability { fn clean(&self, _: &DocContext) -> Stability { Stability { level: self.level, - text: self.text.as_ref().map_or("".to_string(), + text: self.text.as_ref().map_or("".into_string(), |interned| interned.get().to_string()), } } diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index 68ff2ddbcb0e1..3fe872d710574 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -246,7 +246,7 @@ fn path(w: &mut fmt::Formatter, path: &clean::Path, print_all: bool, let cache = cache(); let abs_root = root(&*cache, loc.as_slice()); let rel_root = match path.segments[0].name.as_slice() { - "self" => Some("./".to_string()), + "self" => Some("./".into_string()), _ => None, }; @@ -392,7 +392,7 @@ impl fmt::Show for clean::Type { write!(f, "{style}{lifetimes}|{args}|{bounds}{arrow}", style = FnStyleSpace(decl.fn_style), lifetimes = if decl.lifetimes.len() == 0 { - "".to_string() + "".into_string() } else { format!("<{:#}>", decl.lifetimes) }, @@ -421,13 +421,13 @@ impl fmt::Show for clean::Type { write!(f, "{style}{lifetimes}proc({args}){bounds}{arrow}", style = FnStyleSpace(decl.fn_style), lifetimes = if decl.lifetimes.len() == 0 { - "".to_string() + "".into_string() } else { format!("<{:#}>", decl.lifetimes) }, args = decl.decl.inputs, bounds = if decl.bounds.len() == 0 { - "".to_string() + "".into_string() } else { let m = decl.bounds .iter() @@ -442,8 +442,8 @@ impl fmt::Show for clean::Type { write!(f, "{}{}fn{}{}", FnStyleSpace(decl.fn_style), match decl.abi.as_slice() { - "" => " extern ".to_string(), - "\"Rust\"" => "".to_string(), + "" => " extern ".into_string(), + "\"Rust\"" => "".into_string(), s => format!(" extern {} ", s) }, decl.generics, @@ -470,7 +470,7 @@ impl fmt::Show for clean::Type { clean::BorrowedRef{ lifetime: ref l, mutability, type_: ref ty} => { let lt = match *l { Some(ref l) => format!("{} ", *l), - _ => "".to_string(), + _ => "".into_string(), }; let m = MutableSpace(mutability); match **ty { diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs index 111650f565cf6..c1d98b12b8e92 100644 --- a/src/librustdoc/html/highlight.rs +++ b/src/librustdoc/html/highlight.rs @@ -26,7 +26,7 @@ pub fn highlight(src: &str, class: Option<&str>, id: Option<&str>) -> String { let sess = parse::new_parse_sess(); let fm = parse::string_to_filemap(&sess, src.to_string(), - "".to_string()); + "".into_string()); let mut out = Vec::new(); doit(&sess, diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index 23f31580619ee..dd706c873f70b 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -130,7 +130,7 @@ r##" root_path = page.root_path, ty = page.ty, logo = if layout.logo.len() == 0 { - "".to_string() + "".into_string() } else { format!("\ ", @@ -141,7 +141,7 @@ r##" description = page.description, keywords = page.keywords, favicon = if layout.favicon.len() == 0 { - "".to_string() + "".into_string() } else { format!(r#""#, layout.favicon) }, @@ -152,7 +152,7 @@ r##" krate = layout.krate, play_url = layout.playground_url, play_js = if layout.playground_url.len() == 0 { - "".to_string() + "".into_string() } else { format!(r#""#, page.root_path) }, diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index 10563c61e1465..ada227d15f62b 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -223,7 +223,7 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { // Extract the text provided let s = if text.is_null() { - "".to_string() + "".into_string() } else { unsafe { String::from_raw_buf_len((*text).data, (*text).size as uint) diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 296493f3ba300..0bf354cc39aab 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -263,11 +263,11 @@ pub fn run(mut krate: clean::Crate, root_path: String::new(), sidebar: HashMap::new(), layout: layout::Layout { - logo: "".to_string(), - favicon: "".to_string(), + logo: "".into_string(), + favicon: "".into_string(), external_html: external_html.clone(), krate: krate.name.clone(), - playground_url: "".to_string(), + playground_url: "".into_string(), }, include_sources: true, render_redirect_pages: false, @@ -436,7 +436,7 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> io::IoResult let mut w = Vec::new(); try!(write!(&mut w, r#"searchIndex['{}'] = {{"items":["#, krate.name)); - let mut lastpath = "".to_string(); + let mut lastpath = "".into_string(); for (i, item) in cache.search_index.iter().enumerate() { // Omit the path if it is same to that of the prior item. let path; @@ -616,7 +616,7 @@ fn render_sources(cx: &mut Context, cx: cx, }; // skip all invalid spans - folder.seen.insert("".to_string()); + folder.seen.insert("".into_string()); Ok(folder.fold_crate(krate)) } diff --git a/src/librustdoc/html/toc.rs b/src/librustdoc/html/toc.rs index 4d2f23e1c314e..b7d3084c5ff94 100644 --- a/src/librustdoc/html/toc.rs +++ b/src/librustdoc/html/toc.rs @@ -203,7 +203,7 @@ mod test { ($level: expr, $name: expr) => { assert_eq!(builder.push($level, $name.to_string(), - "".to_string()), + "".into_string()), $name); } } @@ -244,7 +244,7 @@ mod test { level: $level, name: $name.to_string(), sec_number: $name.to_string(), - id: "".to_string(), + id: "".into_string(), children: toc!($($sub),*) } ),* diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 6d9e8dc722f8a..db0b1d7b3cf22 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -303,13 +303,13 @@ fn parse_externs(matches: &getopts::Matches) -> Result { let name = match parts.next() { Some(s) => s, None => { - return Err("--extern value must not be empty".to_string()); + return Err("--extern value must not be empty".into_string()); } }; let location = match parts.next() { Some(s) => s, None => { - return Err("--extern value must be of the format `foo=bar`".to_string()); + return Err("--extern value must be of the format `foo=bar`".into_string()); } }; let locs = match externs.entry(name.to_string()) { @@ -392,7 +392,7 @@ fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matche // Load all plugins/passes into a PluginManager let path = matches.opt_str("plugin-path") - .unwrap_or("/tmp/rustdoc/plugins".to_string()); + .unwrap_or("/tmp/rustdoc/plugins".into_string()); let mut pm = plugins::PluginManager::new(Path::new(path)); for pass in passes.iter() { let plugin = match PASSES.iter() @@ -432,7 +432,7 @@ fn json_input(input: &str) -> Result { Ok(Json::Object(obj)) => { let mut obj = obj; // Make sure the schema is what we expect - match obj.remove(&"schema".to_string()) { + match obj.remove(&"schema".into_string()) { Some(Json::String(version)) => { if version != SCHEMA_VERSION { return Err(format!( @@ -440,15 +440,15 @@ fn json_input(input: &str) -> Result { SCHEMA_VERSION)) } } - Some(..) => return Err("malformed json".to_string()), - None => return Err("expected a schema version".to_string()), + Some(..) => return Err("malformed json".into_string()), + None => return Err("expected a schema version".into_string()), } - let krate = match obj.remove(&"crate".to_string()) { + let krate = match obj.remove(&"crate".into_string()) { Some(json) => { let mut d = json::Decoder::new(json); Decodable::decode(&mut d).unwrap() } - None => return Err("malformed json".to_string()), + None => return Err("malformed json".into_string()), }; // FIXME: this should read from the "plugins" field, but currently // Json doesn't implement decodable... @@ -457,7 +457,7 @@ fn json_input(input: &str) -> Result { } Ok(..) => { Err("malformed json input: expected an object at the \ - top".to_string()) + top".into_string()) } } } @@ -472,7 +472,7 @@ fn json_output(krate: clean::Crate, res: Vec , // "plugins": { output of plugins ... } // } let mut json = std::collections::TreeMap::new(); - json.insert("schema".to_string(), Json::String(SCHEMA_VERSION.to_string())); + json.insert("schema".into_string(), Json::String(SCHEMA_VERSION.to_string())); let plugins_json = res.into_iter() .filter_map(|opt| { match opt { @@ -498,8 +498,8 @@ fn json_output(krate: clean::Crate, res: Vec , Err(e) => panic!("Rust generated JSON is invalid: {}", e) }; - json.insert("crate".to_string(), crate_json); - json.insert("plugins".to_string(), Json::Object(plugins_json)); + json.insert("crate".into_string(), crate_json); + json.insert("plugins".into_string(), Json::Object(plugins_json)); let mut file = try!(File::create(&dst)); Json::Object(json).to_writer(&mut file) diff --git a/src/librustdoc/markdown.rs b/src/librustdoc/markdown.rs index 881c7a91d81d0..c7c8d1b018bbd 100644 --- a/src/librustdoc/markdown.rs +++ b/src/librustdoc/markdown.rs @@ -57,7 +57,7 @@ pub fn render(input: &str, mut output: Path, matches: &getopts::Matches, if playground.is_some() { markdown::PLAYGROUND_KRATE.with(|s| { *s.borrow_mut() = None; }); } - let playground = playground.unwrap_or("".to_string()); + let playground = playground.unwrap_or("".into_string()); let mut out = match io::File::create(&output) { Err(e) => { @@ -141,7 +141,7 @@ pub fn test(input: &str, libs: Vec, externs: core::Externs, let mut collector = Collector::new(input.to_string(), libs, externs, true); find_testable_code(input_str.as_slice(), &mut collector); - test_args.insert(0, "rustdoctest".to_string()); + test_args.insert(0, "rustdoctest".into_string()); testing::test_main(test_args.as_slice(), collector.tests); 0 } diff --git a/src/librustdoc/passes.rs b/src/librustdoc/passes.rs index e368d7f93320c..aa06967f899aa 100644 --- a/src/librustdoc/passes.rs +++ b/src/librustdoc/passes.rs @@ -259,7 +259,7 @@ pub fn unindent_comments(krate: clean::Crate) -> plugins::PluginResult { match attr { &clean::NameValue(ref x, ref s) if "doc" == *x => { - avec.push(clean::NameValue("doc".to_string(), + avec.push(clean::NameValue("doc".into_string(), unindent(s.as_slice()))) } x => avec.push(x.clone()) @@ -295,7 +295,7 @@ pub fn collapse_docs(krate: clean::Crate) -> plugins::PluginResult { _ => true }).map(|x| x.clone()).collect(); if docstr.len() > 0 { - a.push(clean::NameValue("doc".to_string(), docstr)); + a.push(clean::NameValue("doc".into_string(), docstr)); } i.attrs = a; self.fold_item_recur(i) @@ -372,14 +372,14 @@ mod unindent_tests { #[test] fn should_unindent() { - let s = " line1\n line2".to_string(); + let s = " line1\n line2".into_string(); let r = unindent(s.as_slice()); assert_eq!(r, "line1\nline2"); } #[test] fn should_unindent_multiple_paragraphs() { - let s = " line1\n\n line2".to_string(); + let s = " line1\n\n line2".into_string(); let r = unindent(s.as_slice()); assert_eq!(r, "line1\n\nline2"); } @@ -388,7 +388,7 @@ mod unindent_tests { fn should_leave_multiple_indent_levels() { // Line 2 is indented another level beyond the // base indentation and should be preserved - let s = " line1\n\n line2".to_string(); + let s = " line1\n\n line2".into_string(); let r = unindent(s.as_slice()); assert_eq!(r, "line1\n\n line2"); } @@ -400,14 +400,14 @@ mod unindent_tests { // // #[doc = "Start way over here // and continue here"] - let s = "line1\n line2".to_string(); + let s = "line1\n line2".into_string(); let r = unindent(s.as_slice()); assert_eq!(r, "line1\nline2"); } #[test] fn should_not_ignore_first_line_indent_in_a_single_line_para() { - let s = "line1\n\n line2".to_string(); + let s = "line1\n\n line2".into_string(); let r = unindent(s.as_slice()); assert_eq!(r, "line1\n\n line2"); } diff --git a/src/librustdoc/stability_summary.rs b/src/librustdoc/stability_summary.rs index 881270afe140c..0d7f697ab44c6 100644 --- a/src/librustdoc/stability_summary.rs +++ b/src/librustdoc/stability_summary.rs @@ -192,7 +192,7 @@ fn summarize_item(item: &Item) -> (Counts, Option) { submodules.sort(); (counts, Some(ModuleSummary { - name: item.name.as_ref().map_or("".to_string(), |n| n.clone()), + name: item.name.as_ref().map_or("".into_string(), |n| n.clone()), counts: counts, submodules: submodules, })) diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 5759adf32440e..937405e038fb5 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -98,7 +98,7 @@ pub fn run(input: &str, false); collector.fold_crate(krate); - test_args.insert(0, "rustdoctest".to_string()); + test_args.insert(0, "rustdoctest".into_string()); testing::test_main(test_args.as_slice(), collector.tests.into_iter().collect()); diff --git a/src/librustrt/c_str.rs b/src/librustrt/c_str.rs index 07094f08c5de9..34834f87cf633 100644 --- a/src/librustrt/c_str.rs +++ b/src/librustrt/c_str.rs @@ -679,7 +679,7 @@ mod tests { #[test] fn test_clone_noleak() { fn foo(f: |c: &CString|) { - let s = "test".to_string(); + let s = "test".into_string(); let c = s.to_c_str(); // give the closure a non-owned CString let mut c_ = unsafe { CString::new(c.as_ptr(), false) }; diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index d28bd1b9df040..f298e964c6354 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -91,7 +91,7 @@ //! fn main() { //! let object = TestStruct { //! data_int: 1, -//! data_str: "homura".to_string(), +//! data_str: "homura".into_string(), //! data_vector: vec![2,3,4,5], //! }; //! @@ -139,7 +139,7 @@ //! let num = ComplexNum { a: 0.0001, b: 12.539 }; //! let data: String = json::encode(&ComplexNumRecord{ //! uid: 1, -//! dsc: "test".to_string(), +//! dsc: "test".into_string(), //! val: num.to_json(), //! }); //! println!("data: {}", data); @@ -167,9 +167,9 @@ //! fn to_json(&self) -> Json { //! let mut d = TreeMap::new(); //! // All standard types implement `to_json()`, so use it -//! d.insert("data_int".to_string(), self.data_int.to_json()); -//! d.insert("data_str".to_string(), self.data_str.to_json()); -//! d.insert("data_vector".to_string(), self.data_vector.to_json()); +//! d.insert("data_int".into_string(), self.data_int.to_json()); +//! d.insert("data_str".into_string(), self.data_str.to_json()); +//! d.insert("data_vector".into_string(), self.data_vector.to_json()); //! Json::Object(d) //! } //! } @@ -178,7 +178,7 @@ //! // Serialize using `ToJson` //! let input_data = TestStruct { //! data_int: 1, -//! data_str: "madoka".to_string(), +//! data_str: "madoka".into_string(), //! data_vector: vec![2,3,4,5], //! }; //! let json_obj: Json = input_data.to_json(); diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 23eb367dbd10a..a1d729e638024 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -682,7 +682,7 @@ mod tests { assert_eq!("( ;".to_ascii(), b); let v = vec![40u8, 32u8, 59u8]; assert_eq!(v.to_ascii(), b); - assert_eq!("( ;".to_string().to_ascii(), b); + assert_eq!("( ;".into_string().to_ascii(), b); assert_eq!("abCDef&?#".to_ascii().to_lowercase().into_string(), "abcdef&?#"); assert_eq!("abCDef&?#".to_ascii().to_uppercase().into_string(), "ABCDEF&?#"); @@ -712,7 +712,7 @@ mod tests { #[test] fn test_owned_ascii_vec() { - assert_eq!(("( ;".to_string()).into_ascii(), vec2ascii![40, 32, 59]); + assert_eq!(("( ;".into_string()).into_ascii(), vec2ascii![40, 32, 59]); assert_eq!((vec![40u8, 32u8, 59u8]).into_ascii(), vec2ascii![40, 32, 59]); } @@ -771,8 +771,8 @@ mod tests { assert_eq!((vec![40u8, 32u8, 59u8]).into_ascii_opt(), Some(vec2ascii![40, 32, 59])); assert_eq!((vec![127u8, 128u8, 255u8]).into_ascii_opt(), None); - assert_eq!(("( ;".to_string()).into_ascii_opt(), Some(vec2ascii![40, 32, 59])); - assert_eq!(("zoä华".to_string()).into_ascii_opt(), None); + assert_eq!(("( ;".into_string()).into_ascii_opt(), Some(vec2ascii![40, 32, 59])); + assert_eq!(("zoä华".into_string()).into_ascii_opt(), None); } #[test] @@ -808,9 +808,9 @@ mod tests { #[test] fn test_into_ascii_upper() { - assert_eq!(("url()URL()uRl()ürl".to_string()).into_ascii_upper(), - "URL()URL()URL()üRL".to_string()); - assert_eq!(("hıKß".to_string()).into_ascii_upper(), "HıKß"); + assert_eq!(("url()URL()uRl()ürl".into_string()).into_ascii_upper(), + "URL()URL()URL()üRL".into_string()); + assert_eq!(("hıKß".into_string()).into_ascii_upper(), "HıKß"); let mut i = 0; while i <= 500 { @@ -824,10 +824,10 @@ mod tests { #[test] fn test_into_ascii_lower() { - assert_eq!(("url()URL()uRl()Ürl".to_string()).into_ascii_lower(), + assert_eq!(("url()URL()uRl()Ürl".into_string()).into_ascii_lower(), "url()url()url()Ürl"); // Dotted capital I, Kelvin sign, Sharp S. - assert_eq!(("HİKß".to_string()).into_ascii_lower(), "hİKß"); + assert_eq!(("HİKß".into_string()).into_ascii_lower(), "hİKß"); let mut i = 0; while i <= 500 { diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index a8dce232d26d5..f4cb12bffa20d 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -2025,9 +2025,9 @@ mod test_map { let mut m = HashMap::new(); let (foo, bar, baz) = (1i,2i,3i); - m.insert("foo".to_string(), foo); - m.insert("bar".to_string(), bar); - m.insert("baz".to_string(), baz); + m.insert("foo".into_string(), foo); + m.insert("bar".into_string(), bar); + m.insert("baz".into_string(), baz); assert_eq!(m.get("foo"), Some(&foo)); diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index b3ccfdbb47cce..0dfe12fe32eac 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -264,8 +264,8 @@ impl, S, H: Hasher> HashSet { /// ``` /// use std::collections::HashSet; /// let mut set = HashSet::new(); - /// set.insert("a".to_string()); - /// set.insert("b".to_string()); + /// set.insert("a".into_string()); + /// set.insert("b".into_string()); /// /// // Not possible to collect to a Vec with a regular `.iter()`. /// let v: Vec = set.into_iter().collect(); diff --git a/src/libstd/collections/lru_cache.rs b/src/libstd/collections/lru_cache.rs index 6caa2f7b4da6a..d7a774442250d 100644 --- a/src/libstd/collections/lru_cache.rs +++ b/src/libstd/collections/lru_cache.rs @@ -399,22 +399,22 @@ mod tests { #[test] fn test_put_update() { let mut cache: LruCache> = LruCache::new(1); - cache.insert("1".to_string(), vec![10, 10]); - cache.insert("1".to_string(), vec![10, 19]); - assert_opt_eq(cache.get(&"1".to_string()), vec![10, 19]); + cache.insert("1".into_string(), vec![10, 10]); + cache.insert("1".into_string(), vec![10, 19]); + assert_opt_eq(cache.get(&"1".into_string()), vec![10, 19]); assert_eq!(cache.len(), 1); } #[test] fn test_expire_lru() { let mut cache: LruCache = LruCache::new(2); - cache.insert("foo1".to_string(), "bar1".to_string()); - cache.insert("foo2".to_string(), "bar2".to_string()); - cache.insert("foo3".to_string(), "bar3".to_string()); - assert!(cache.get(&"foo1".to_string()).is_none()); - cache.insert("foo2".to_string(), "bar2update".to_string()); - cache.insert("foo4".to_string(), "bar4".to_string()); - assert!(cache.get(&"foo3".to_string()).is_none()); + cache.insert("foo1".into_string(), "bar1".into_string()); + cache.insert("foo2".into_string(), "bar2".into_string()); + cache.insert("foo3".into_string(), "bar3".into_string()); + assert!(cache.get(&"foo1".into_string()).is_none()); + cache.insert("foo2".into_string(), "bar2update".into_string()); + cache.insert("foo4".into_string(), "bar4".into_string()); + assert!(cache.get(&"foo3".into_string()).is_none()); } #[test] diff --git a/src/libstd/fmt.rs b/src/libstd/fmt.rs index d0c9df9d914e7..5315651c2587a 100644 --- a/src/libstd/fmt.rs +++ b/src/libstd/fmt.rs @@ -435,7 +435,7 @@ pub use core::fmt::{argument, argumentuint}; /// use std::fmt; /// /// let s = format_args!(fmt::format, "Hello, {}!", "world"); -/// assert_eq!(s, "Hello, world!".to_string()); +/// assert_eq!(s, "Hello, world!".into_string()); /// ``` #[experimental = "this is an implementation detail of format! and should not \ be called directly"] diff --git a/src/libstd/hash.rs b/src/libstd/hash.rs index ac68e1ef121fb..72cc66139d6b8 100644 --- a/src/libstd/hash.rs +++ b/src/libstd/hash.rs @@ -26,8 +26,8 @@ //! phone: u64, //! } //! -//! let person1 = Person { id: 5, name: "Janet".to_string(), phone: 555_666_7777 }; -//! let person2 = Person { id: 5, name: "Bob".to_string(), phone: 555_666_7777 }; +//! let person1 = Person { id: 5, name: "Janet".into_string(), phone: 555_666_7777 }; +//! let person2 = Person { id: 5, name: "Bob".into_string(), phone: 555_666_7777 }; //! //! assert!(hash::hash(&person1) != hash::hash(&person2)); //! ``` @@ -53,8 +53,8 @@ //! } //! } //! -//! let person1 = Person { id: 5, name: "Janet".to_string(), phone: 555_666_7777 }; -//! let person2 = Person { id: 5, name: "Bob".to_string(), phone: 555_666_7777 }; +//! let person1 = Person { id: 5, name: "Janet".into_string(), phone: 555_666_7777 }; +//! let person2 = Person { id: 5, name: "Bob".into_string(), phone: 555_666_7777 }; //! //! assert!(hash::hash(&person1) == hash::hash(&person2)); //! ``` diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index a8de7356fe7d1..39cb1f4efffaf 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -593,9 +593,9 @@ mod test { fn test_read_line() { let in_buf = MemReader::new(b"a\nb\nc".to_vec()); let mut reader = BufferedReader::with_capacity(2, in_buf); - assert_eq!(reader.read_line(), Ok("a\n".to_string())); - assert_eq!(reader.read_line(), Ok("b\n".to_string())); - assert_eq!(reader.read_line(), Ok("c".to_string())); + assert_eq!(reader.read_line(), Ok("a\n".into_string())); + assert_eq!(reader.read_line(), Ok("b\n".into_string())); + assert_eq!(reader.read_line(), Ok("c".into_string())); assert!(reader.read_line().is_err()); } @@ -604,9 +604,9 @@ mod test { let in_buf = MemReader::new(b"a\nb\nc".to_vec()); let mut reader = BufferedReader::with_capacity(2, in_buf); let mut it = reader.lines(); - assert_eq!(it.next(), Some(Ok("a\n".to_string()))); - assert_eq!(it.next(), Some(Ok("b\n".to_string()))); - assert_eq!(it.next(), Some(Ok("c".to_string()))); + assert_eq!(it.next(), Some(Ok("a\n".into_string()))); + assert_eq!(it.next(), Some(Ok("b\n".into_string()))); + assert_eq!(it.next(), Some(Ok("c".into_string()))); assert_eq!(it.next(), None); } diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index 4ec1a3764db66..2b3414443ffad 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -214,8 +214,8 @@ mod test { let mut reader = ChanReader::new(rx); - assert_eq!(Ok("hello world\n".to_string()), reader.read_line()); - assert_eq!(Ok("how are you?".to_string()), reader.read_line()); + assert_eq!(Ok("hello world\n".into_string()), reader.read_line()); + assert_eq!(Ok("how are you?".into_string()), reader.read_line()); match reader.read_line() { Ok(..) => panic!(), Err(e) => assert_eq!(e.kind, io::EndOfFile), diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index c46a6e82e4486..560c155d760f3 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -1052,7 +1052,7 @@ mod tests { let r = os::env(); for &(ref k, ref v) in r.iter() { // don't check android RANDOM variables - if *k != "RANDOM".to_string() { + if *k != "RANDOM".into_string() { assert!(output.contains(format!("{}={}", *k, *v).as_slice()) || diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index faa52226a03b7..dba8523cb6223 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -404,21 +404,21 @@ mod test { let r = &mut b"0123456789\n0123456789\n"; { let mut r = LimitReader::new(r.by_ref(), 3); - assert_eq!(r.read_line(), Ok("012".to_string())); + assert_eq!(r.read_line(), Ok("012".into_string())); assert_eq!(r.limit(), 0); assert_eq!(r.read_line().err().unwrap().kind, io::EndOfFile); } { let mut r = LimitReader::new(r.by_ref(), 9); - assert_eq!(r.read_line(), Ok("3456789\n".to_string())); + assert_eq!(r.read_line(), Ok("3456789\n".into_string())); assert_eq!(r.limit(), 1); - assert_eq!(r.read_line(), Ok("0".to_string())); + assert_eq!(r.read_line(), Ok("0".into_string())); } { let mut r = LimitReader::new(r.by_ref(), 100); assert_eq!(r.read_char(), Ok('1')); assert_eq!(r.limit(), 99); - assert_eq!(r.read_line(), Ok("23456789\n".to_string())); + assert_eq!(r.read_line(), Ok("23456789\n".into_string())); } } diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 6c91010f4cb35..0f42b4360e66c 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -1816,7 +1816,7 @@ mod tests { fn test_setenv() { let n = make_rand_name(); setenv(n.as_slice(), "VALUE"); - assert_eq!(getenv(n.as_slice()), option::Option::Some("VALUE".to_string())); + assert_eq!(getenv(n.as_slice()), option::Option::Some("VALUE".into_string())); } #[test] @@ -1833,9 +1833,9 @@ mod tests { let n = make_rand_name(); setenv(n.as_slice(), "1"); setenv(n.as_slice(), "2"); - assert_eq!(getenv(n.as_slice()), option::Option::Some("2".to_string())); + assert_eq!(getenv(n.as_slice()), option::Option::Some("2".into_string())); setenv(n.as_slice(), ""); - assert_eq!(getenv(n.as_slice()), option::Option::Some("".to_string())); + assert_eq!(getenv(n.as_slice()), option::Option::Some("".into_string())); } // Windows GetEnvironmentVariable requires some extra work to make sure @@ -1843,7 +1843,7 @@ mod tests { #[test] #[ignore] fn test_getenv_big() { - let mut s = "".to_string(); + let mut s = "".into_string(); let mut i = 0i; while i < 100 { s.push_str("aaaaaaaaaa"); @@ -1909,10 +1909,10 @@ mod tests { let mut e = env(); setenv(n.as_slice(), "VALUE"); - assert!(!e.contains(&(n.clone(), "VALUE".to_string()))); + assert!(!e.contains(&(n.clone(), "VALUE".into_string()))); e = env(); - assert!(e.contains(&(n, "VALUE".to_string()))); + assert!(e.contains(&(n, "VALUE".into_string()))); } #[test] diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index ba2c89bf1ce1a..0c6ce4815631c 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -744,7 +744,7 @@ mod tests { t!(s: "a/b/c", ["d", "e"], "a/b/c/d/e"); t!(s: "a/b/c", ["d", "/e"], "/e"); t!(s: "a/b/c", ["d", "/e", "f"], "/e/f"); - t!(s: "a/b/c", ["d".to_string(), "e".to_string()], "a/b/c/d/e"); + t!(s: "a/b/c", ["d".into_string(), "e".into_string()], "a/b/c/d/e"); t!(v: b"a/b/c", [b"d", b"e"], b"a/b/c/d/e"); t!(v: b"a/b/c", [b"d", b"/e", b"f"], b"/e/f"); t!(v: b"a/b/c", [b"d".to_vec(), b"e".to_vec()], b"a/b/c/d/e"); @@ -849,7 +849,7 @@ mod tests { t!(s: "a/b/c", ["d", "e"], "a/b/c/d/e"); t!(s: "a/b/c", ["..", "d"], "a/b/d"); t!(s: "a/b/c", ["d", "/e", "f"], "/e/f"); - t!(s: "a/b/c", ["d".to_string(), "e".to_string()], "a/b/c/d/e"); + t!(s: "a/b/c", ["d".into_string(), "e".into_string()], "a/b/c/d/e"); t!(v: b"a/b/c", [b"d", b"e"], b"a/b/c/d/e"); t!(v: b"a/b/c", [b"d".to_vec(), b"e".to_vec()], b"a/b/c/d/e"); } diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index ea522536d22fd..be619ad225762 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -1588,7 +1588,7 @@ mod tests { t!(s: "a\\b\\c", ["d", "e"], "a\\b\\c\\d\\e"); t!(s: "a\\b\\c", ["d", "\\e"], "\\e"); t!(s: "a\\b\\c", ["d", "\\e", "f"], "\\e\\f"); - t!(s: "a\\b\\c", ["d".to_string(), "e".to_string()], "a\\b\\c\\d\\e"); + t!(s: "a\\b\\c", ["d".into_string(), "e".into_string()], "a\\b\\c\\d\\e"); t!(v: b"a\\b\\c", [b"d", b"e"], b"a\\b\\c\\d\\e"); t!(v: b"a\\b\\c", [b"d", b"\\e", b"f"], b"\\e\\f"); t!(v: b"a\\b\\c", [b"d".to_vec(), b"e".to_vec()], @@ -1729,7 +1729,7 @@ mod tests { t!(s: "a\\b\\c", ["d", "e"], "a\\b\\c\\d\\e"); t!(s: "a\\b\\c", ["..", "d"], "a\\b\\d"); t!(s: "a\\b\\c", ["d", "\\e", "f"], "\\e\\f"); - t!(s: "a\\b\\c", ["d".to_string(), "e".to_string()], "a\\b\\c\\d\\e"); + t!(s: "a\\b\\c", ["d".into_string(), "e".into_string()], "a\\b\\c\\d\\e"); t!(v: b"a\\b\\c", [b"d", b"e"], b"a\\b\\c\\d\\e"); t!(v: b"a\\b\\c", [b"d".to_vec(), b"e".to_vec()], b"a\\b\\c\\d\\e"); diff --git a/src/libstd/sync/future.rs b/src/libstd/sync/future.rs index a8c9983e5aac5..26d516633cb98 100644 --- a/src/libstd/sync/future.rs +++ b/src/libstd/sync/future.rs @@ -152,33 +152,33 @@ mod test { #[test] fn test_from_value() { - let mut f = Future::from_value("snail".to_string()); + let mut f = Future::from_value("snail".into_string()); assert_eq!(f.get(), "snail"); } #[test] fn test_from_receiver() { let (tx, rx) = channel(); - tx.send("whale".to_string()); + tx.send("whale".into_string()); let mut f = Future::from_receiver(rx); assert_eq!(f.get(), "whale"); } #[test] fn test_from_fn() { - let mut f = Future::from_fn(proc() "brail".to_string()); + let mut f = Future::from_fn(proc() "brail".into_string()); assert_eq!(f.get(), "brail"); } #[test] fn test_interface_get() { - let mut f = Future::from_value("fail".to_string()); + let mut f = Future::from_value("fail".into_string()); assert_eq!(f.get(), "fail"); } #[test] fn test_interface_unwrap() { - let f = Future::from_value("fail".to_string()); + let f = Future::from_value("fail".into_string()); assert_eq!(f.unwrap(), "fail"); } @@ -190,7 +190,7 @@ mod test { #[test] fn test_spawn() { - let mut f = Future::spawn(proc() "bale".to_string()); + let mut f = Future::spawn(proc() "bale".into_string()); assert_eq!(f.get(), "bale"); } diff --git a/src/libstd/task.rs b/src/libstd/task.rs index c91417e611ed1..1959b6c9f1626 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -288,7 +288,7 @@ mod test { #[test] fn test_owned_named_task() { - TaskBuilder::new().named("ada lovelace".to_string()).try(proc() { + TaskBuilder::new().named("ada lovelace".into_string()).try(proc() { assert!(name().unwrap() == "ada lovelace"); }).map_err(|_| ()).unwrap(); } @@ -330,7 +330,7 @@ mod test { #[test] fn test_try_success() { match try(proc() { - "Success!".to_string() + "Success!".into_string() }).as_ref().map(|s| s.as_slice()) { result::Result::Ok("Success!") => (), _ => panic!() @@ -459,7 +459,7 @@ mod test { #[test] fn test_try_panic_message_owned_str() { match try(proc() { - panic!("owned string".to_string()); + panic!("owned string".into_string()); }) { Err(e) => { type T = String; diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 7dba6a57fc4c9..78117ed036b82 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -157,8 +157,8 @@ pub fn uint_ty_max(t: UintTy) -> u64 { pub fn float_ty_to_string(t: FloatTy) -> String { match t { - TyF32 => "f32".to_string(), - TyF64 => "f64".to_string(), + TyF32 => "f32".into_string(), + TyF64 => "f64".into_string(), } } diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 50b4f3423688c..abd5e59364573 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -402,7 +402,7 @@ impl CodeMap { pub fn span_to_string(&self, sp: Span) -> String { if self.files.borrow().len() == 0 && sp == DUMMY_SP { - return "no-location".to_string(); + return "no-location".into_string(); } let lo = self.lookup_char_pos_adj(sp.lo); @@ -583,21 +583,21 @@ mod test { #[test] fn t1 () { let cm = CodeMap::new(); - let fm = cm.new_filemap("blork.rs".to_string(), - "first line.\nsecond line".to_string()); + let fm = cm.new_filemap("blork.rs".into_string(), + "first line.\nsecond line".into_string()); fm.next_line(BytePos(0)); - assert_eq!(fm.get_line(0), Some("first line.".to_string())); + assert_eq!(fm.get_line(0), Some("first line.".into_string())); // TESTING BROKEN BEHAVIOR: fm.next_line(BytePos(10)); - assert_eq!(fm.get_line(1), Some(".".to_string())); + assert_eq!(fm.get_line(1), Some(".".into_string())); } #[test] #[should_fail] fn t2 () { let cm = CodeMap::new(); - let fm = cm.new_filemap("blork.rs".to_string(), - "first line.\nsecond line".to_string()); + let fm = cm.new_filemap("blork.rs".into_string(), + "first line.\nsecond line".into_string()); // TESTING *REALLY* BROKEN BEHAVIOR: fm.next_line(BytePos(0)); fm.next_line(BytePos(10)); @@ -606,12 +606,12 @@ mod test { fn init_code_map() -> CodeMap { let cm = CodeMap::new(); - let fm1 = cm.new_filemap("blork.rs".to_string(), - "first line.\nsecond line".to_string()); - let fm2 = cm.new_filemap("empty.rs".to_string(), - "".to_string()); - let fm3 = cm.new_filemap("blork2.rs".to_string(), - "first line.\nsecond line".to_string()); + let fm1 = cm.new_filemap("blork.rs".into_string(), + "first line.\nsecond line".into_string()); + let fm2 = cm.new_filemap("empty.rs".into_string(), + "".into_string()); + let fm3 = cm.new_filemap("blork2.rs".into_string(), + "first line.\nsecond line".into_string()); fm1.next_line(BytePos(0)); fm1.next_line(BytePos(12)); @@ -668,10 +668,10 @@ mod test { let cm = CodeMap::new(); // € is a three byte utf8 char. let fm1 = - cm.new_filemap("blork.rs".to_string(), - "fir€st €€€€ line.\nsecond line".to_string()); - let fm2 = cm.new_filemap("blork2.rs".to_string(), - "first line€€.\n€ second line".to_string()); + cm.new_filemap("blork.rs".into_string(), + "fir€st €€€€ line.\nsecond line".into_string()); + let fm2 = cm.new_filemap("blork2.rs".into_string(), + "first line€€.\n€ second line".into_string()); fm1.next_line(BytePos(0)); fm1.next_line(BytePos(22)); @@ -727,7 +727,7 @@ mod test { let span = Span {lo: BytePos(12), hi: BytePos(23), expn_id: NO_EXPANSION}; let snippet = cm.span_to_snippet(span); - assert_eq!(snippet, Some("second line".to_string())); + assert_eq!(snippet, Some("second line".into_string())); } #[test] diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index bbda80bd96c33..b2ad4458c99c6 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -166,7 +166,7 @@ impl Handler { let s; match self.err_count.get() { 0u => return, - 1u => s = "aborting due to previous error".to_string(), + 1u => s = "aborting due to previous error".into_string(), _ => { s = format!("aborting due to {} previous errors", self.err_count.get()); diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs index 2be11a236d3b7..302eff56eff86 100644 --- a/src/libsyntax/diagnostics/plugin.rs +++ b/src/libsyntax/diagnostics/plugin.rs @@ -83,7 +83,7 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt, } }); let sym = Ident::new(token::gensym(( - "__register_diagnostic_".to_string() + token::get_ident(*code).get() + "__register_diagnostic_".into_string() + token::get_ident(*code).get() ).as_slice())); MacItems::new(vec![quote_item!(ecx, mod $sym {}).unwrap()].into_iter()) } diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index b138811187ba9..687eabae32ecd 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -199,7 +199,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let expn_id = cx.codemap().record_expansion(codemap::ExpnInfo { call_site: sp, callee: codemap::NameAndSpan { - name: "asm".to_string(), + name: "asm".into_string(), format: codemap::MacroBang, span: None, }, diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index d5f472bd82710..bd8aa00a54733 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -875,7 +875,7 @@ impl<'a> MethodDef<'a> { let self_arg_names = self_args.iter().enumerate() .map(|(arg_count, _self_arg)| { if arg_count == 0 { - "__self".to_string() + "__self".into_string() } else { format!("__arg_{}", arg_count) } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index a697d332d16af..708e41840db85 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1322,17 +1322,17 @@ mod test { // *kind* of failure occurs. fn test_ecfg() -> ExpansionConfig { - ExpansionConfig::default("test".to_string()) + ExpansionConfig::default("test".into_string()) } // make sure that macros can't escape fns #[should_fail] #[test] fn macros_cant_escape_fns_test () { let src = "fn bogus() {macro_rules! z (() => (3+4))}\ - fn inty() -> int { z!() }".to_string(); + fn inty() -> int { z!() }".into_string(); let sess = parse::new_parse_sess(); let crate_ast = parse::parse_crate_from_source_str( - "".to_string(), + "".into_string(), src, Vec::new(), &sess); // should fail: @@ -1343,10 +1343,10 @@ mod test { #[should_fail] #[test] fn macros_cant_escape_mods_test () { let src = "mod foo {macro_rules! z (() => (3+4))}\ - fn inty() -> int { z!() }".to_string(); + fn inty() -> int { z!() }".into_string(); let sess = parse::new_parse_sess(); let crate_ast = parse::parse_crate_from_source_str( - "".to_string(), + "".into_string(), src, Vec::new(), &sess); expand_crate(&sess,test_ecfg(),vec!(),vec!(),crate_ast); @@ -1355,10 +1355,10 @@ mod test { // macro_escape modules should allow macros to escape #[test] fn macros_can_escape_flattened_mods_test () { let src = "#[macro_escape] mod foo {macro_rules! z (() => (3+4))}\ - fn inty() -> int { z!() }".to_string(); + fn inty() -> int { z!() }".into_string(); let sess = parse::new_parse_sess(); let crate_ast = parse::parse_crate_from_source_str( - "".to_string(), + "".into_string(), src, Vec::new(), &sess); expand_crate(&sess, test_ecfg(), vec!(), vec!(), crate_ast); @@ -1406,14 +1406,14 @@ mod test { #[test] fn macro_tokens_should_match(){ expand_crate_str( - "macro_rules! m((a)=>(13)) fn main(){m!(a);}".to_string()); + "macro_rules! m((a)=>(13)) fn main(){m!(a);}".into_string()); } // should be able to use a bound identifier as a literal in a macro definition: #[test] fn self_macro_parsing(){ expand_crate_str( "macro_rules! foo ((zz) => (287u;)) - fn f(zz : int) {foo!(zz);}".to_string() + fn f(zz : int) {foo!(zz);}".into_string() ); } @@ -1591,7 +1591,7 @@ mod test { "macro_rules! my_method (() => (fn thirteen(&self) -> int {13})) struct A; impl A{ my_method!()} - fn f(){A.thirteen;}".to_string()); + fn f(){A.thirteen;}".into_string()); } // another nested macro @@ -1684,7 +1684,7 @@ mod test { let crate_str = "macro_rules! fmt_wrap(($b:expr)=>($b.to_string())) macro_rules! foo_module (() => (mod generated { fn a() { let xx = 147; fmt_wrap!(xx);}})) foo_module!() -".to_string(); +".into_string(); let cr = expand_crate_str(crate_str); // find the xx binding let bindings = crate_bindings(&cr); @@ -1725,7 +1725,7 @@ foo_module!() #[test] fn pat_idents(){ let pat = string_to_pat( - "(a,Foo{x:c @ (b,9),y:Bar(4,d)})".to_string()); + "(a,Foo{x:c @ (b,9),y:Bar(4,d)})".into_string()); let idents = pattern_bindings(&*pat); assert_eq!(idents, strs_to_idents(vec!("a","c","b","d"))); } @@ -1736,7 +1736,7 @@ foo_module!() #[test] fn crate_bindings_test(){ let the_crate = string_to_crate("fn main (a : int) -> int {|b| { - match 34 {None => 3, Some(i) | i => j, Foo{k:z,l:y} => \"banana\"}} }".to_string()); + match 34 {None => 3, Some(i) | i => j, Foo{k:z,l:y} => \"banana\"}} }".into_string()); let idents = crate_bindings(&the_crate); assert_eq!(idents, strs_to_idents(vec!("a","b","None","i","i","z","y"))); } @@ -1744,7 +1744,7 @@ foo_module!() // test the IdentRenamer directly #[test] fn ident_renamer_test () { - let the_crate = string_to_crate("fn f(x : int){let x = x; x}".to_string()); + let the_crate = string_to_crate("fn f(x : int){let x = x; x}".into_string()); let f_ident = token::str_to_ident("f"); let x_ident = token::str_to_ident("x"); let int_ident = token::str_to_ident("int"); @@ -1759,7 +1759,7 @@ foo_module!() // test the PatIdentRenamer; only PatIdents get renamed #[test] fn pat_ident_renamer_test () { - let the_crate = string_to_crate("fn f(x : int){let x = x; x}".to_string()); + let the_crate = string_to_crate("fn f(x : int){let x = x; x}".into_string()); let f_ident = token::str_to_ident("f"); let x_ident = token::str_to_ident("x"); let int_ident = token::str_to_ident("int"); diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index c8fed3dcd16f6..6880f158ee7a2 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -227,8 +227,8 @@ impl<'a, 'b> Context<'a, 'b> { fn describe_num_args(&self) -> string::String { match self.args.len() { - 0 => "no arguments given".to_string(), - 1 => "there is 1 argument".to_string(), + 0 => "no arguments given".into_string(), + 1 => "there is 1 argument".into_string(), x => format!("there are {} arguments", x), } } diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 45752499ad592..dc859e9bd1a43 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -211,7 +211,7 @@ pub mod rt { impl ToSource for () { fn to_source(&self) -> String { - "()".to_string() + "()".into_string() } } impl ToSourceWithHygiene for () { @@ -354,7 +354,7 @@ pub mod rt { fn parse_item(&self, s: String) -> P { let res = parse::parse_item_from_source_str( - "".to_string(), + "".into_string(), s, self.cfg(), self.parse_sess()); @@ -368,7 +368,7 @@ pub mod rt { } fn parse_stmt(&self, s: String) -> P { - parse::parse_stmt_from_source_str("".to_string(), + parse::parse_stmt_from_source_str("".into_string(), s, self.cfg(), Vec::new(), @@ -376,14 +376,14 @@ pub mod rt { } fn parse_expr(&self, s: String) -> P { - parse::parse_expr_from_source_str("".to_string(), + parse::parse_expr_from_source_str("".into_string(), s, self.cfg(), self.parse_sess()) } fn parse_tts(&self, s: String) -> Vec { - parse::parse_tts_from_source_str("".to_string(), + parse::parse_tts_from_source_str("".into_string(), s, self.cfg(), self.parse_sess()) @@ -394,7 +394,7 @@ pub mod rt { fn parse_tts_with_hygiene(&self, s: String) -> Vec { use parse::with_hygiene::parse_tts_from_source_str; - parse_tts_from_source_str("".to_string(), + parse_tts_from_source_str("".into_string(), s, self.cfg(), self.parse_sess()) diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 4785fe37293c0..e3106149220d0 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -448,9 +448,9 @@ pub fn parse(sess: &ParseSess, } return Success(nameize(sess, ms, v.as_slice())); } else if eof_eis.len() > 1u { - return Error(sp, "ambiguity: multiple successful parses".to_string()); + return Error(sp, "ambiguity: multiple successful parses".into_string()); } else { - return Failure(sp, "unexpected end of macro invocation".to_string()); + return Failure(sp, "unexpected end of macro invocation".into_string()); } } else { if (bb_eis.len() > 0u && next_eis.len() > 0u) diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 92c68b7a9c724..f252bcbefa0a8 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -154,7 +154,7 @@ fn generic_extension<'cx>(cx: &'cx ExtCtxt, // Which arm's failure should we report? (the one furthest along) let mut best_fail_spot = DUMMY_SP; - let mut best_fail_msg = "internal error: ran no matchers".to_string(); + let mut best_fail_msg = "internal error: ran no matchers".into_string(); for (i, lhs) in lhses.iter().enumerate() { // try each arm's matchers match **lhs { diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 122f99cabb3f6..b2451364af8b4 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -1484,13 +1484,13 @@ mod test { #[test] fn ident_transformation () { let mut zz_fold = ToZzIdentFolder; let ast = string_to_crate( - "#[a] mod b {fn c (d : e, f : g) {h!(i,j,k);l;m}}".to_string()); + "#[a] mod b {fn c (d : e, f : g) {h!(i,j,k);l;m}}".into_string()); let folded_crate = zz_fold.fold_crate(ast); assert_pred!( matches_codepattern, "matches_codepattern", pprust::to_string(|s| fake_print_crate(s, &folded_crate)), - "#[a]mod zz{fn zz(zz:zz,zz:zz){zz!(zz,zz,zz);zz;zz}}".to_string()); + "#[a]mod zz{fn zz(zz:zz,zz:zz){zz!(zz,zz,zz);zz;zz}}".into_string()); } // even inside macro defs.... @@ -1498,12 +1498,12 @@ mod test { let mut zz_fold = ToZzIdentFolder; let ast = string_to_crate( "macro_rules! a {(b $c:expr $(d $e:token)f+ => \ - (g $(d $d $e)+))} ".to_string()); + (g $(d $d $e)+))} ".into_string()); let folded_crate = zz_fold.fold_crate(ast); assert_pred!( matches_codepattern, "matches_codepattern", pprust::to_string(|s| fake_print_crate(s, &folded_crate)), - "zz!zz((zz$zz:zz$(zz $zz:zz)zz+=>(zz$(zz$zz$zz)+)))".to_string()); + "zz!zz((zz$zz:zz$(zz $zz:zz)zz+=>(zz$(zz$zz$zz)+)))".into_string()); } } diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index a17d66476c08c..908d4fed821e1 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -231,7 +231,7 @@ fn trim_whitespace_prefix_and_push_line(lines: &mut Vec , if col < len { s.slice(col, len).to_string() } else { - "".to_string() + "".into_string() } } None => s, diff --git a/src/libsyntax/parse/lexer/mod.rs b/src/libsyntax/parse/lexer/mod.rs index 2a77e3e67915b..b9532cdae2d66 100644 --- a/src/libsyntax/parse/lexer/mod.rs +++ b/src/libsyntax/parse/lexer/mod.rs @@ -1144,7 +1144,7 @@ impl<'a> StringReader<'a> { // character before position `start` is an // ascii single quote. start - BytePos(1), last_bpos, - "unterminated character constant".to_string()); + "unterminated character constant".into_string()); } let id = if valid { self.name_from(start) } else { token::intern("0") }; self.bump(); // advance curr past token @@ -1335,7 +1335,7 @@ impl<'a> StringReader<'a> { let last_pos = self.last_pos; self.fatal_span_verbose( start - BytePos(2), last_pos, - "unterminated byte constant".to_string()); + "unterminated byte constant".into_string()); } let id = if valid { self.name_from(start) } else { token::intern("??") }; @@ -1491,7 +1491,7 @@ mod test { // open a string reader for the given string fn setup<'a>(span_handler: &'a diagnostic::SpanHandler, teststr: String) -> StringReader<'a> { - let fm = span_handler.cm.new_filemap("zebra.rs".to_string(), teststr); + let fm = span_handler.cm.new_filemap("zebra.rs".into_string(), teststr); StringReader::new(span_handler, fm) } @@ -1499,7 +1499,7 @@ mod test { let span_handler = mk_sh(); let mut string_reader = setup(&span_handler, "/* my source file */ \ - fn main() { println!(\"zebra\"); }\n".to_string()); + fn main() { println!(\"zebra\"); }\n".into_string()); let id = str_to_ident("fn"); assert_eq!(string_reader.next_token().tok, token::Comment); assert_eq!(string_reader.next_token().tok, token::Whitespace); @@ -1535,21 +1535,21 @@ mod test { } #[test] fn doublecolonparsing () { - check_tokenization(setup(&mk_sh(), "a b".to_string()), + check_tokenization(setup(&mk_sh(), "a b".into_string()), vec![mk_ident("a", token::Plain), token::Whitespace, mk_ident("b", token::Plain)]); } #[test] fn dcparsing_2 () { - check_tokenization(setup(&mk_sh(), "a::b".to_string()), + check_tokenization(setup(&mk_sh(), "a::b".into_string()), vec![mk_ident("a",token::ModName), token::ModSep, mk_ident("b", token::Plain)]); } #[test] fn dcparsing_3 () { - check_tokenization(setup(&mk_sh(), "a ::b".to_string()), + check_tokenization(setup(&mk_sh(), "a ::b".into_string()), vec![mk_ident("a", token::Plain), token::Whitespace, token::ModSep, @@ -1557,7 +1557,7 @@ mod test { } #[test] fn dcparsing_4 () { - check_tokenization(setup(&mk_sh(), "a:: b".to_string()), + check_tokenization(setup(&mk_sh(), "a:: b".into_string()), vec![mk_ident("a",token::ModName), token::ModSep, token::Whitespace, @@ -1565,28 +1565,28 @@ mod test { } #[test] fn character_a() { - assert_eq!(setup(&mk_sh(), "'a'".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "'a'".into_string()).next_token().tok, token::Literal(token::Char(token::intern("a")), None)); } #[test] fn character_space() { - assert_eq!(setup(&mk_sh(), "' '".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "' '".into_string()).next_token().tok, token::Literal(token::Char(token::intern(" ")), None)); } #[test] fn character_escaped() { - assert_eq!(setup(&mk_sh(), "'\\n'".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "'\\n'".into_string()).next_token().tok, token::Literal(token::Char(token::intern("\\n")), None)); } #[test] fn lifetime_name() { - assert_eq!(setup(&mk_sh(), "'abc".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "'abc".into_string()).next_token().tok, token::Lifetime(token::str_to_ident("'abc"))); } #[test] fn raw_string() { assert_eq!(setup(&mk_sh(), - "r###\"\"#a\\b\x00c\"\"###".to_string()).next_token() + "r###\"\"#a\\b\x00c\"\"###".into_string()).next_token() .tok, token::Literal(token::StrRaw(token::intern("\"#a\\b\x00c\""), 3), None)); } @@ -1614,13 +1614,13 @@ mod test { test!("1.0", Float, "1.0"); test!("1.0e10", Float, "1.0e10"); - assert_eq!(setup(&mk_sh(), "2u".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "2u".into_string()).next_token().tok, token::Literal(token::Integer(token::intern("2")), Some(token::intern("u")))); - assert_eq!(setup(&mk_sh(), "r###\"raw\"###suffix".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "r###\"raw\"###suffix".into_string()).next_token().tok, token::Literal(token::StrRaw(token::intern("raw"), 3), Some(token::intern("suffix")))); - assert_eq!(setup(&mk_sh(), "br###\"raw\"###suffix".to_string()).next_token().tok, + assert_eq!(setup(&mk_sh(), "br###\"raw\"###suffix".into_string()).next_token().tok, token::Literal(token::BinaryRaw(token::intern("raw"), 3), Some(token::intern("suffix")))); } @@ -1633,7 +1633,7 @@ mod test { #[test] fn nested_block_comments() { let sh = mk_sh(); - let mut lexer = setup(&sh, "/* /* */ */'a'".to_string()); + let mut lexer = setup(&sh, "/* /* */ */'a'".into_string()); match lexer.next_token().tok { token::Comment => { }, _ => panic!("expected a comment!") diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 951fe11a470bb..a33e726451d1e 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -761,7 +761,7 @@ mod test { } #[test] fn path_exprs_1() { - assert!(string_to_expr("a".to_string()) == + assert!(string_to_expr("a".into_string()) == P(ast::Expr{ id: ast::DUMMY_NODE_ID, node: ast::ExprPath(ast::Path { @@ -779,7 +779,7 @@ mod test { } #[test] fn path_exprs_2 () { - assert!(string_to_expr("::a::b".to_string()) == + assert!(string_to_expr("::a::b".into_string()) == P(ast::Expr { id: ast::DUMMY_NODE_ID, node: ast::ExprPath(ast::Path { @@ -802,13 +802,13 @@ mod test { #[should_fail] #[test] fn bad_path_expr_1() { - string_to_expr("::abc::def::return".to_string()); + string_to_expr("::abc::def::return".into_string()); } // check the token-tree-ization of macros #[test] fn string_to_tts_macro () { - let tts = string_to_tts("macro_rules! zip (($a)=>($a))".to_string()); + let tts = string_to_tts("macro_rules! zip (($a)=>($a))".into_string()); let tts: &[ast::TokenTree] = tts.as_slice(); match tts { [ast::TtToken(_, token::Ident(name_macro_rules, token::Plain)), @@ -846,7 +846,7 @@ mod test { #[test] fn string_to_tts_1 () { - let tts = string_to_tts("fn a (b : int) { b; }".to_string()); + let tts = string_to_tts("fn a (b : int) { b; }".into_string()); assert_eq!(json::encode(&tts), "[\ {\ @@ -959,7 +959,7 @@ mod test { } #[test] fn ret_expr() { - assert!(string_to_expr("return d".to_string()) == + assert!(string_to_expr("return d".into_string()) == P(ast::Expr{ id: ast::DUMMY_NODE_ID, node:ast::ExprRet(Some(P(ast::Expr{ @@ -981,7 +981,7 @@ mod test { } #[test] fn parse_stmt_1 () { - assert!(string_to_stmt("b;".to_string()) == + assert!(string_to_stmt("b;".into_string()) == P(Spanned{ node: ast::StmtExpr(P(ast::Expr { id: ast::DUMMY_NODE_ID, @@ -1007,7 +1007,7 @@ mod test { #[test] fn parse_ident_pat () { let sess = new_parse_sess(); - let mut parser = string_to_parser(&sess, "b".to_string()); + let mut parser = string_to_parser(&sess, "b".into_string()); assert!(parser.parse_pat() == P(ast::Pat{ id: ast::DUMMY_NODE_ID, @@ -1023,7 +1023,7 @@ mod test { // check the contents of the tt manually: #[test] fn parse_fundecl () { // this test depends on the intern order of "fn" and "int" - assert!(string_to_item("fn a (b : int) { b; }".to_string()) == + assert!(string_to_item("fn a (b : int) { b; }".into_string()) == Some( P(ast::Item{ident:str_to_ident("a"), attrs:Vec::new(), @@ -1170,8 +1170,8 @@ mod test { #[test] fn parse_exprs () { // just make sure that they parse.... - string_to_expr("3 + 4".to_string()); - string_to_expr("a::z.froob(b,&(987+3))".to_string()); + string_to_expr("3 + 4".into_string()); + string_to_expr("a::z.froob(b,&(987+3))".into_string()); } #[test] fn attrs_fix_bug () { @@ -1186,26 +1186,26 @@ mod test { fn wb() -> c_int { O_WRONLY as c_int } let mut fflags: c_int = wb(); -}".to_string()); +}".into_string()); } #[test] fn crlf_doc_comments() { let sess = new_parse_sess(); - let name = "".to_string(); - let source = "/// doc comment\r\nfn foo() {}".to_string(); + let name = "".into_string(); + let source = "/// doc comment\r\nfn foo() {}".into_string(); let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap(); let doc = attr::first_attr_value_str_by_name(item.attrs.as_slice(), "doc").unwrap(); assert_eq!(doc.get(), "/// doc comment"); - let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".to_string(); + let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".into_string(); let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap(); let docs = item.attrs.iter().filter(|a| a.name().get() == "doc") .map(|a| a.value_str().unwrap().get().to_string()).collect::>(); - let b: &[_] = &["/// doc comment".to_string(), "/// line 2".to_string()]; + let b: &[_] = &["/// doc comment".into_string(), "/// line 2".into_string()]; assert_eq!(docs.as_slice(), b); - let source = "/** doc comment\r\n * with CRLF */\r\nfn foo() {}".to_string(); + let source = "/** doc comment\r\n * with CRLF */\r\nfn foo() {}".into_string(); let item = parse_item_from_source_str(name, source, Vec::new(), &sess).unwrap(); let doc = attr::first_attr_value_str_by_name(item.attrs.as_slice(), "doc").unwrap(); assert_eq!(doc.get(), "/** doc comment\n * with CRLF */"); diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs index c4e040a0f7c1a..a20707f57b1fb 100644 --- a/src/libsyntax/print/pp.rs +++ b/src/libsyntax/print/pp.rs @@ -120,10 +120,10 @@ impl Token { pub fn tok_str(t: Token) -> string::String { match t { String(s, len) => return format!("STR({},{})", s, len), - Break(_) => return "BREAK".to_string(), - Begin(_) => return "BEGIN".to_string(), - End => return "END".to_string(), - Eof => return "EOF".to_string() + Break(_) => return "BREAK".into_string(), + Begin(_) => return "BEGIN".into_string(), + End => return "END".into_string(), + Eof => return "EOF".into_string() } } diff --git a/src/libsyntax/test.rs b/src/libsyntax/test.rs index ca2f190ce76be..a4f4406dbd592 100644 --- a/src/libsyntax/test.rs +++ b/src/libsyntax/test.rs @@ -245,7 +245,7 @@ fn generate_test_harness(sess: &ParseSess, sess: sess, span_diagnostic: sd, ext_cx: ExtCtxt::new(sess, cfg.clone(), - ExpansionConfig::default("test".to_string())), + ExpansionConfig::default("test".into_string())), path: Vec::new(), testfns: Vec::new(), reexport_test_harness_main: reexport_test_harness_main, @@ -257,7 +257,7 @@ fn generate_test_harness(sess: &ParseSess, cx.ext_cx.bt_push(ExpnInfo { call_site: DUMMY_SP, callee: NameAndSpan { - name: "test".to_string(), + name: "test".into_string(), format: MacroAttribute, span: None } diff --git a/src/libsyntax/util/parser_testing.rs b/src/libsyntax/util/parser_testing.rs index c1ea8f60b8201..d12142e181abb 100644 --- a/src/libsyntax/util/parser_testing.rs +++ b/src/libsyntax/util/parser_testing.rs @@ -20,14 +20,14 @@ use ptr::P; pub fn string_to_tts(source_str: String) -> Vec { let ps = new_parse_sess(); filemap_to_tts(&ps, - string_to_filemap(&ps, source_str, "bogofile".to_string())) + string_to_filemap(&ps, source_str, "bogofile".into_string())) } /// Map string to parser (via tts) pub fn string_to_parser<'a>(ps: &'a ParseSess, source_str: String) -> Parser<'a> { new_parser_from_source_str(ps, Vec::new(), - "bogofile".to_string(), + "bogofile".into_string(), source_str) } diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs index 65f8415835a36..04a4353c54175 100644 --- a/src/libterm/terminfo/mod.rs +++ b/src/libterm/terminfo/mod.rs @@ -150,7 +150,7 @@ impl Terminal for TerminfoTerminal { cap = self.ti.strings.get("op"); } } - let s = cap.map_or(Err("can't find terminfo capability `sgr0`".to_string()), |op| { + let s = cap.map_or(Err("can't find terminfo capability `sgr0`".into_string()), |op| { expand(op.as_slice(), &[], &mut Variables::new()) }); if s.is_ok() { diff --git a/src/libterm/terminfo/parm.rs b/src/libterm/terminfo/parm.rs index c81bff6a1aeb3..55017b6dadde2 100644 --- a/src/libterm/terminfo/parm.rs +++ b/src/libterm/terminfo/parm.rs @@ -135,9 +135,9 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) c as u8 }) } - _ => return Err("a non-char was used with %c".to_string()) + _ => return Err("a non-char was used with %c".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, 'p' => state = PushParam, 'P' => state = SetVar, 'g' => state = GetVar, @@ -146,112 +146,112 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) 'l' => if stack.len() > 0 { match stack.pop().unwrap() { Words(s) => stack.push(Number(s.len() as int)), - _ => return Err("a non-str was used with %l".to_string()) + _ => return Err("a non-str was used with %l".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '+' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x + y)), - _ => return Err("non-numbers on stack with +".to_string()) + _ => return Err("non-numbers on stack with +".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '-' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x - y)), - _ => return Err("non-numbers on stack with -".to_string()) + _ => return Err("non-numbers on stack with -".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '*' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x * y)), - _ => return Err("non-numbers on stack with *".to_string()) + _ => return Err("non-numbers on stack with *".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '/' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x / y)), - _ => return Err("non-numbers on stack with /".to_string()) + _ => return Err("non-numbers on stack with /".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, 'm' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x % y)), - _ => return Err("non-numbers on stack with %".to_string()) + _ => return Err("non-numbers on stack with %".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '&' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x & y)), - _ => return Err("non-numbers on stack with &".to_string()) + _ => return Err("non-numbers on stack with &".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '|' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x | y)), - _ => return Err("non-numbers on stack with |".to_string()) + _ => return Err("non-numbers on stack with |".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '^' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(x ^ y)), - _ => return Err("non-numbers on stack with ^".to_string()) + _ => return Err("non-numbers on stack with ^".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '=' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(if x == y { 1 } else { 0 })), - _ => return Err("non-numbers on stack with =".to_string()) + _ => return Err("non-numbers on stack with =".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '>' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(if x > y { 1 } else { 0 })), - _ => return Err("non-numbers on stack with >".to_string()) + _ => return Err("non-numbers on stack with >".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '<' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(y), Number(x)) => stack.push(Number(if x < y { 1 } else { 0 })), - _ => return Err("non-numbers on stack with <".to_string()) + _ => return Err("non-numbers on stack with <".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, 'A' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(0), Number(_)) => stack.push(Number(0)), (Number(_), Number(0)) => stack.push(Number(0)), (Number(_), Number(_)) => stack.push(Number(1)), - _ => return Err("non-numbers on stack with logical and".to_string()) + _ => return Err("non-numbers on stack with logical and".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, 'O' => if stack.len() > 1 { match (stack.pop().unwrap(), stack.pop().unwrap()) { (Number(0), Number(0)) => stack.push(Number(0)), (Number(_), Number(_)) => stack.push(Number(1)), - _ => return Err("non-numbers on stack with logical or".to_string()) + _ => return Err("non-numbers on stack with logical or".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '!' => if stack.len() > 0 { match stack.pop().unwrap() { Number(0) => stack.push(Number(1)), Number(_) => stack.push(Number(0)), - _ => return Err("non-number on stack with logical not".to_string()) + _ => return Err("non-number on stack with logical not".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, '~' => if stack.len() > 0 { match stack.pop().unwrap() { Number(x) => stack.push(Number(!x)), - _ => return Err("non-number on stack with %~".to_string()) + _ => return Err("non-number on stack with %~".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, 'i' => match (mparams[0].clone(), mparams[1].clone()) { (Number(x), Number(y)) => { mparams[0] = Number(x+1); mparams[1] = Number(y+1); }, - (_, _) => return Err("first two params not numbers with %i".to_string()) + (_, _) => return Err("first two params not numbers with %i".into_string()) }, // printf-style support for %doxXs @@ -260,7 +260,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) let res = format(stack.pop().unwrap(), FormatOp::from_char(cur), flags); if res.is_err() { return res } output.push_all(res.unwrap().as_slice()) - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, ':'|'#'|' '|'.'|'0'...'9' => { let mut flags = Flags::new(); let mut fstate = FormatStateFlags; @@ -285,9 +285,9 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) Number(0) => state = SeekIfElse(0), Number(_) => (), _ => return Err("non-number on stack \ - with conditional".to_string()) + with conditional".into_string()) } - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, 'e' => state = SeekIfEnd(0), ';' => (), @@ -300,7 +300,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) // params are 1-indexed stack.push(mparams[match cur.to_digit(10) { Some(d) => d - 1, - None => return Err("bad param number".to_string()) + None => return Err("bad param number".into_string()) }].clone()); }, SetVar => { @@ -308,14 +308,14 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) if stack.len() > 0 { let idx = (cur as u8) - b'A'; vars.sta[idx as uint] = stack.pop().unwrap(); - } else { return Err("stack is empty".to_string()) } + } else { return Err("stack is empty".into_string()) } } else if cur >= 'a' && cur <= 'z' { if stack.len() > 0 { let idx = (cur as u8) - b'a'; vars.dyn[idx as uint] = stack.pop().unwrap(); - } else { return Err("stack is empty".to_string()) } + } else { return Err("stack is empty".into_string()) } } else { - return Err("bad variable name in %P".to_string()); + return Err("bad variable name in %P".into_string()); } }, GetVar => { @@ -326,7 +326,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) let idx = (cur as u8) - b'a'; stack.push(vars.dyn[idx as uint].clone()); } else { - return Err("bad variable name in %g".to_string()); + return Err("bad variable name in %g".into_string()); } }, CharConstant => { @@ -335,7 +335,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) }, CharClose => { if cur != '\'' { - return Err("malformed character constant".to_string()); + return Err("malformed character constant".into_string()); } }, IntConstant(i) => { @@ -348,7 +348,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) state = IntConstant(i*10 + (cur as int - '0' as int)); old_state = Nothing; } - _ => return Err("bad int constant".to_string()) + _ => return Err("bad int constant".into_string()) } } FormatPattern(ref mut flags, ref mut fstate) => { @@ -360,7 +360,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) output.push_all(res.unwrap().as_slice()); // will cause state to go to Nothing old_state = FormatPattern(*flags, *fstate); - } else { return Err("stack is empty".to_string()) }, + } else { return Err("stack is empty".into_string()) }, (FormatStateFlags,'#') => { flags.alternate = true; } @@ -383,7 +383,7 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) (FormatStateWidth,'0'...'9') => { let old = flags.width; flags.width = flags.width * 10 + (cur as uint - '0' as uint); - if flags.width < old { return Err("format width overflow".to_string()) } + if flags.width < old { return Err("format width overflow".into_string()) } } (FormatStateWidth,'.') => { *fstate = FormatStatePrecision; @@ -392,10 +392,10 @@ pub fn expand(cap: &[u8], params: &[Param], vars: &mut Variables) let old = flags.precision; flags.precision = flags.precision * 10 + (cur as uint - '0' as uint); if flags.precision < old { - return Err("format precision overflow".to_string()) + return Err("format precision overflow".into_string()) } } - _ => return Err("invalid format specifier".to_string()) + _ => return Err("invalid format specifier".into_string()) } } SeekIfElse(level) => { @@ -507,7 +507,7 @@ fn format(val: Param, op: FormatOp, flags: Flags) -> Result ,String> { (FormatHex, _) => format!("{:x}", d).into_bytes(), (FormatHEX, _) => format!("{:X}", d).into_bytes(), (FormatString, _) => { - return Err("non-number on stack with %s".to_string()) + return Err("non-number on stack with %s".into_string()) } }; let mut s: Vec = s.into_iter().collect(); @@ -626,7 +626,7 @@ mod test { assert!(res.is_err(), "Op {} succeeded incorrectly with 0 stack entries", cap); let p = if cap == "%s" || cap == "%l" { - Words("foo".to_string()) + Words("foo".into_string()) } else { Number(97) }; @@ -695,12 +695,12 @@ mod test { let mut varstruct = Variables::new(); let vars = &mut varstruct; assert_eq!(expand(b"%p1%s%p2%2s%p3%2s%p4%.2s", - &[Words("foo".to_string()), - Words("foo".to_string()), - Words("f".to_string()), - Words("foo".to_string())], vars), + &[Words("foo".into_string()), + Words("foo".into_string()), + Words("f".into_string()), + Words("foo".into_string())], vars), Ok("foofoo ffo".bytes().collect::>())); - assert_eq!(expand(b"%p1%:-4.2s", &[Words("foo".to_string())], vars), + assert_eq!(expand(b"%p1%:-4.2s", &[Words("foo".into_string())], vars), Ok("fo ".bytes().collect::>())); assert_eq!(expand(b"%p1%d%p1%.3d%p1%5d%p1%:+d", &[Number(1)], vars), diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs index 9b5e6f5cc9f6f..2998e9d53a1ce 100644 --- a/src/libterm/terminfo/parser/compiled.rs +++ b/src/libterm/terminfo/parser/compiled.rs @@ -198,24 +198,24 @@ pub fn parse(file: &mut io::Reader, longnames: bool) if (bools_bytes as uint) > boolnames.len() { return Err("incompatible file: more booleans than \ - expected".to_string()); + expected".into_string()); } if (numbers_count as uint) > numnames.len() { return Err("incompatible file: more numbers than \ - expected".to_string()); + expected".into_string()); } if (string_offsets_count as uint) > stringnames.len() { return Err("incompatible file: more string offsets than \ - expected".to_string()); + expected".into_string()); } // don't read NUL let bytes = try!(file.read_exact(names_bytes as uint - 1)); let names_str = match String::from_utf8(bytes) { Ok(s) => s, - Err(_) => return Err("input not utf-8".to_string()), + Err(_) => return Err("input not utf-8".into_string()), }; let term_names: Vec = names_str.split('|') @@ -260,7 +260,7 @@ pub fn parse(file: &mut io::Reader, longnames: bool) if string_table.len() != string_table_bytes as uint { return Err("error: hit EOF before end of string \ - table".to_string()); + table".into_string()); } for (i, v) in string_offsets.iter().enumerate() { @@ -294,7 +294,7 @@ pub fn parse(file: &mut io::Reader, longnames: bool) }, None => { return Err("invalid file: missing NUL in \ - string_table".to_string()); + string_table".into_string()); } }; } @@ -312,12 +312,12 @@ pub fn parse(file: &mut io::Reader, longnames: bool) /// Create a dummy TermInfo struct for msys terminals pub fn msys_terminfo() -> Box { let mut strings = HashMap::new(); - strings.insert("sgr0".to_string(), b"\x1B[0m".to_vec()); - strings.insert("bold".to_string(), b"\x1B[1m".to_vec()); - strings.insert("setaf".to_string(), b"\x1B[3%p1%dm".to_vec()); - strings.insert("setab".to_string(), b"\x1B[4%p1%dm".to_vec()); + strings.insert("sgr0".into_string(), b"\x1B[0m".to_vec()); + strings.insert("bold".into_string(), b"\x1B[1m".to_vec()); + strings.insert("setaf".into_string(), b"\x1B[3%p1%dm".to_vec()); + strings.insert("setab".into_string(), b"\x1B[4%p1%dm".to_vec()); box TermInfo { - names: vec!("cygwin".to_string()), // msys is a fork of an older cygwin version + names: vec!("cygwin".into_string()), // msys is a fork of an older cygwin version bools: HashMap::new(), numbers: HashMap::new(), strings: strings diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index ffc26738dd7b2..8ce6ca117cd1c 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -697,9 +697,9 @@ impl ConsoleTestState { None => Ok(()), Some(ref mut o) => { let s = format!("{} {}\n", match *result { - TrOk => "ok".to_string(), - TrFailed => "failed".to_string(), - TrIgnored => "ignored".to_string(), + TrOk => "ok".into_string(), + TrFailed => "failed".into_string(), + TrIgnored => "ignored".into_string(), TrMetrics(ref mm) => fmt_metrics(mm), TrBench(ref bs) => fmt_bench_samples(bs) }, test.name.as_slice()); @@ -1570,7 +1570,7 @@ mod tests { #[test] fn first_free_arg_should_be_a_filter() { - let args = vec!("progname".to_string(), "some_regex_filter".to_string()); + let args = vec!("progname".into_string(), "some_regex_filter".into_string()); let opts = match parse_opts(args.as_slice()) { Some(Ok(o)) => o, _ => panic!("Malformed arg in first_free_arg_should_be_a_filter") @@ -1580,9 +1580,9 @@ mod tests { #[test] fn parse_ignored_flag() { - let args = vec!("progname".to_string(), - "filter".to_string(), - "--ignored".to_string()); + let args = vec!("progname".into_string(), + "filter".into_string(), + "--ignored".into_string()); let opts = match parse_opts(args.as_slice()) { Some(Ok(o)) => o, _ => panic!("Malformed arg in parse_ignored_flag") @@ -1630,15 +1630,15 @@ mod tests { opts.run_tests = true; let names = - vec!("sha1::test".to_string(), - "int::test_to_str".to_string(), - "int::test_pow".to_string(), - "test::do_not_run_ignored_tests".to_string(), - "test::ignored_tests_result_in_ignored".to_string(), - "test::first_free_arg_should_be_a_filter".to_string(), - "test::parse_ignored_flag".to_string(), - "test::filter_for_ignored_option".to_string(), - "test::sort_tests".to_string()); + vec!("sha1::test".into_string(), + "int::test_to_str".into_string(), + "int::test_pow".into_string(), + "test::do_not_run_ignored_tests".into_string(), + "test::ignored_tests_result_in_ignored".into_string(), + "test::first_free_arg_should_be_a_filter".into_string(), + "test::parse_ignored_flag".into_string(), + "test::filter_for_ignored_option".into_string(), + "test::sort_tests".into_string()); let tests = { fn testfn() { } @@ -1659,15 +1659,15 @@ mod tests { let filtered = filter_tests(&opts, tests); let expected = - vec!("int::test_pow".to_string(), - "int::test_to_str".to_string(), - "sha1::test".to_string(), - "test::do_not_run_ignored_tests".to_string(), - "test::filter_for_ignored_option".to_string(), - "test::first_free_arg_should_be_a_filter".to_string(), - "test::ignored_tests_result_in_ignored".to_string(), - "test::parse_ignored_flag".to_string(), - "test::sort_tests".to_string()); + vec!("int::test_pow".into_string(), + "int::test_to_str".into_string(), + "sha1::test".into_string(), + "test::do_not_run_ignored_tests".into_string(), + "test::filter_for_ignored_option".into_string(), + "test::first_free_arg_should_be_a_filter".into_string(), + "test::ignored_tests_result_in_ignored".into_string(), + "test::parse_ignored_flag".into_string(), + "test::sort_tests".into_string()); for (a, b) in expected.iter().zip(filtered.iter()) { assert!(*a == b.desc.name.to_string()); @@ -1729,31 +1729,31 @@ mod tests { let diff1 = m2.compare_to_old(&m1, None); - assert_eq!(*(diff1.get(&"in-both-noise".to_string()).unwrap()), LikelyNoise); - assert_eq!(*(diff1.get(&"in-first-noise".to_string()).unwrap()), MetricRemoved); - assert_eq!(*(diff1.get(&"in-second-noise".to_string()).unwrap()), MetricAdded); - assert_eq!(*(diff1.get(&"in-both-want-downwards-but-regressed".to_string()).unwrap()), + assert_eq!(*(diff1.get(&"in-both-noise".into_string()).unwrap()), LikelyNoise); + assert_eq!(*(diff1.get(&"in-first-noise".into_string()).unwrap()), MetricRemoved); + assert_eq!(*(diff1.get(&"in-second-noise".into_string()).unwrap()), MetricAdded); + assert_eq!(*(diff1.get(&"in-both-want-downwards-but-regressed".into_string()).unwrap()), Regression(100.0)); - assert_eq!(*(diff1.get(&"in-both-want-downwards-and-improved".to_string()).unwrap()), + assert_eq!(*(diff1.get(&"in-both-want-downwards-and-improved".into_string()).unwrap()), Improvement(50.0)); - assert_eq!(*(diff1.get(&"in-both-want-upwards-but-regressed".to_string()).unwrap()), + assert_eq!(*(diff1.get(&"in-both-want-upwards-but-regressed".into_string()).unwrap()), Regression(50.0)); - assert_eq!(*(diff1.get(&"in-both-want-upwards-and-improved".to_string()).unwrap()), + assert_eq!(*(diff1.get(&"in-both-want-upwards-and-improved".into_string()).unwrap()), Improvement(100.0)); assert_eq!(diff1.len(), 7); let diff2 = m2.compare_to_old(&m1, Some(200.0)); - assert_eq!(*(diff2.get(&"in-both-noise".to_string()).unwrap()), LikelyNoise); - assert_eq!(*(diff2.get(&"in-first-noise".to_string()).unwrap()), MetricRemoved); - assert_eq!(*(diff2.get(&"in-second-noise".to_string()).unwrap()), MetricAdded); - assert_eq!(*(diff2.get(&"in-both-want-downwards-but-regressed".to_string()).unwrap()), + assert_eq!(*(diff2.get(&"in-both-noise".into_string()).unwrap()), LikelyNoise); + assert_eq!(*(diff2.get(&"in-first-noise".into_string()).unwrap()), MetricRemoved); + assert_eq!(*(diff2.get(&"in-second-noise".into_string()).unwrap()), MetricAdded); + assert_eq!(*(diff2.get(&"in-both-want-downwards-but-regressed".into_string()).unwrap()), LikelyNoise); - assert_eq!(*(diff2.get(&"in-both-want-downwards-and-improved".to_string()).unwrap()), + assert_eq!(*(diff2.get(&"in-both-want-downwards-and-improved".into_string()).unwrap()), LikelyNoise); - assert_eq!(*(diff2.get(&"in-both-want-upwards-but-regressed".to_string()).unwrap()), + assert_eq!(*(diff2.get(&"in-both-want-upwards-but-regressed".into_string()).unwrap()), LikelyNoise); - assert_eq!(*(diff2.get(&"in-both-want-upwards-and-improved".to_string()).unwrap()), + assert_eq!(*(diff2.get(&"in-both-want-upwards-and-improved".into_string()).unwrap()), LikelyNoise); assert_eq!(diff2.len(), 7); } @@ -1778,29 +1778,29 @@ mod tests { let (diff1, ok1) = m2.ratchet(&pth, None); assert_eq!(ok1, false); assert_eq!(diff1.len(), 2); - assert_eq!(*(diff1.get(&"runtime".to_string()).unwrap()), Regression(10.0)); - assert_eq!(*(diff1.get(&"throughput".to_string()).unwrap()), LikelyNoise); + assert_eq!(*(diff1.get(&"runtime".into_string()).unwrap()), Regression(10.0)); + assert_eq!(*(diff1.get(&"throughput".into_string()).unwrap()), LikelyNoise); // Check that it was not rewritten. let m3 = MetricMap::load(&pth); let MetricMap(m3) = m3; assert_eq!(m3.len(), 2); - assert_eq!(*(m3.get(&"runtime".to_string()).unwrap()), Metric::new(1000.0, 2.0)); - assert_eq!(*(m3.get(&"throughput".to_string()).unwrap()), Metric::new(50.0, 2.0)); + assert_eq!(*(m3.get(&"runtime".into_string()).unwrap()), Metric::new(1000.0, 2.0)); + assert_eq!(*(m3.get(&"throughput".into_string()).unwrap()), Metric::new(50.0, 2.0)); // Ask for a ratchet with an explicit noise-percentage override, // that should advance. let (diff2, ok2) = m2.ratchet(&pth, Some(10.0)); assert_eq!(ok2, true); assert_eq!(diff2.len(), 2); - assert_eq!(*(diff2.get(&"runtime".to_string()).unwrap()), LikelyNoise); - assert_eq!(*(diff2.get(&"throughput".to_string()).unwrap()), LikelyNoise); + assert_eq!(*(diff2.get(&"runtime".into_string()).unwrap()), LikelyNoise); + assert_eq!(*(diff2.get(&"throughput".into_string()).unwrap()), LikelyNoise); // Check that it was rewritten. let m4 = MetricMap::load(&pth); let MetricMap(m4) = m4; assert_eq!(m4.len(), 2); - assert_eq!(*(m4.get(&"runtime".to_string()).unwrap()), Metric::new(1100.0, 2.0)); - assert_eq!(*(m4.get(&"throughput".to_string()).unwrap()), Metric::new(50.0, 2.0)); + assert_eq!(*(m4.get(&"runtime".into_string()).unwrap()), Metric::new(1100.0, 2.0)); + assert_eq!(*(m4.get(&"throughput".into_string()).unwrap()), Metric::new(50.0, 2.0)); } } diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index f9e6907f0e880..5617720127d5b 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -1034,11 +1034,11 @@ mod tests { } t(&Summary::new(&[-2.0f64, -1.0f64]), - "-2 |[------******#*****---]| -1".to_string()); + "-2 |[------******#*****---]| -1".into_string()); t(&Summary::new(&[0.0f64, 2.0f64]), - "0 |[-------*****#*******---]| 2".to_string()); + "0 |[-------*****#*******---]| 2".into_string()); t(&Summary::new(&[-2.0f64, 0.0f64]), - "-2 |[------******#******---]| 0".to_string()); + "-2 |[------******#******---]| 0".into_string()); } #[test] diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index e293c547944d5..eeadb62e2ef70 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -1456,62 +1456,62 @@ mod tests { } let days = [ - "Sunday".to_string(), - "Monday".to_string(), - "Tuesday".to_string(), - "Wednesday".to_string(), - "Thursday".to_string(), - "Friday".to_string(), - "Saturday".to_string() + "Sunday".into_string(), + "Monday".into_string(), + "Tuesday".into_string(), + "Wednesday".into_string(), + "Thursday".into_string(), + "Friday".into_string(), + "Saturday".into_string() ]; for day in days.iter() { assert!(test(day.as_slice(), "%A")); } let days = [ - "Sun".to_string(), - "Mon".to_string(), - "Tue".to_string(), - "Wed".to_string(), - "Thu".to_string(), - "Fri".to_string(), - "Sat".to_string() + "Sun".into_string(), + "Mon".into_string(), + "Tue".into_string(), + "Wed".into_string(), + "Thu".into_string(), + "Fri".into_string(), + "Sat".into_string() ]; for day in days.iter() { assert!(test(day.as_slice(), "%a")); } let months = [ - "January".to_string(), - "February".to_string(), - "March".to_string(), - "April".to_string(), - "May".to_string(), - "June".to_string(), - "July".to_string(), - "August".to_string(), - "September".to_string(), - "October".to_string(), - "November".to_string(), - "December".to_string() + "January".into_string(), + "February".into_string(), + "March".into_string(), + "April".into_string(), + "May".into_string(), + "June".into_string(), + "July".into_string(), + "August".into_string(), + "September".into_string(), + "October".into_string(), + "November".into_string(), + "December".into_string() ]; for day in months.iter() { assert!(test(day.as_slice(), "%B")); } let months = [ - "Jan".to_string(), - "Feb".to_string(), - "Mar".to_string(), - "Apr".to_string(), - "May".to_string(), - "Jun".to_string(), - "Jul".to_string(), - "Aug".to_string(), - "Sep".to_string(), - "Oct".to_string(), - "Nov".to_string(), - "Dec".to_string() + "Jan".into_string(), + "Feb".into_string(), + "Mar".into_string(), + "Apr".into_string(), + "May".into_string(), + "Jun".into_string(), + "Jul".into_string(), + "Aug".into_string(), + "Sep".into_string(), + "Oct".into_string(), + "Nov".into_string(), + "Dec".into_string() ]; for day in months.iter() { assert!(test(day.as_slice(), "%b")); From 47643753206f7d8023aed962c214b30388cbce09 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Wed, 10 Dec 2014 12:06:44 -0500 Subject: [PATCH 2/2] libcollections: fix fallout --- src/libcollections/string.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index ac5fa1ea50c75..f5df2d7f587b7 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -1015,7 +1015,7 @@ mod tests { use test::Bencher; use slice::CloneSliceAllocPrelude; - use str::{Str, StrPrelude}; + use str::{Str, StrAllocating, StrPrelude}; use str; use super::{as_string, String, ToString}; use vec::Vec;