diff --git a/RELEASES.txt b/RELEASES.txt index ee437b658e1a3..cc14f1ab56e13 100644 --- a/RELEASES.txt +++ b/RELEASES.txt @@ -80,7 +80,7 @@ Version 0.10 (April 2014) `slice::last()`) now return `Option` instead of `T` + failing. * std: `fmt::Default` has been renamed to `fmt::Show`, and it now has a new deriving mode: `#[deriving(Show)]`. - * std: `ToStr` is now implemented for all types implementing `Show`. + * std: `ToString` is now implemented for all types implementing `Show`. * std: The formatting trait methods now take `&self` instead of `&T` * std: The `invert()` method on iterators has been renamed to `rev()` * std: `std::num` has seen a reduction in the genericity of its traits, @@ -528,7 +528,7 @@ Version 0.7 (July 2013) * `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style argument list. * `Encodable`, `Decodable`, `Ord`, `TotalOrd`, `TotalEq`, `DeepClone`, - `Rand`, `Zero` and `ToStr` can all be automatically derived with + `Rand`, `Zero` and `ToString` can all be automatically derived with `#[deriving(...)]`. * The `bytes!` macro returns a vector of bytes for string, u8, char, and unsuffixed integer literals. diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index f9c3894e274f8..f9882c5b8257c 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -200,7 +200,7 @@ pub fn log_config(config: &Config) { opt_str(&config.filter .as_ref() .map(|re| { - re.to_str().into_string() + re.to_string().into_string() })))); logv(c, format!("runtool: {}", opt_str(&config.runtool))); logv(c, format!("host-rustcflags: {}", diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs index 8e79f58c60881..7681792bdf53d 100644 --- a/src/compiletest/errors.rs +++ b/src/compiletest/errors.rs @@ -31,7 +31,7 @@ pub fn load_errors(re: &Regex, testfile: &Path) -> Vec { fn parse_expected(line_num: uint, line: &str, re: &Regex) -> Option { re.captures(line).and_then(|caps| { let adjusts = caps.name("adjusts").len(); - let kind = caps.name("kind").to_ascii().to_lower().into_str(); + let kind = caps.name("kind").to_ascii().to_lower().into_string(); let msg = caps.name("msg").trim().to_string(); debug!("line={} kind={} msg={}", line_num, kind, msg); diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs index 84bf0eb11553e..8f1a52ba87660 100644 --- a/src/compiletest/util.rs +++ b/src/compiletest/util.rs @@ -41,7 +41,7 @@ pub fn make_new_path(path: &str) -> String { Some(curr) => { format!("{}{}{}", path, path_div(), curr) } - None => path.to_str() + None => path.to_string() } } diff --git a/src/doc/complement-cheatsheet.md b/src/doc/complement-cheatsheet.md index 84fd140a23af4..f9bd8990919e4 100644 --- a/src/doc/complement-cheatsheet.md +++ b/src/doc/complement-cheatsheet.md @@ -4,11 +4,11 @@ **Int to string** -Use [`ToStr`](std/to_str/trait.ToStr.html). +Use [`ToString`](std/to_str/trait.ToString.html). ~~~ let x: int = 42; -let y: String = x.to_str(); +let y: String = x.to_string(); ~~~ **String to int** diff --git a/src/doc/guide-tasks.md b/src/doc/guide-tasks.md index 81d7f37d6fbcc..f7dad78d2fce0 100644 --- a/src/doc/guide-tasks.md +++ b/src/doc/guide-tasks.md @@ -463,7 +463,7 @@ fn stringifier(channel: &DuplexStream) { let mut value: uint; loop { value = channel.recv(); - channel.send(value.to_str()); + channel.send(value.to_string()); if value == 0 { break; } } } @@ -476,7 +476,7 @@ send strings (the first type parameter) and receive `uint` messages (the second type parameter). The body itself simply loops, reading from the channel and then sending its response back. The actual response itself is simply the stringified version of the received value, -`uint::to_str(value)`. +`uint::to_string(value)`. Here is the code for the parent task: @@ -488,7 +488,7 @@ use std::comm::duplex; # let mut value: uint; # loop { # value = channel.recv(); -# channel.send(value.to_str()); +# channel.send(value.to_string()); # if value == 0u { break; } # } # } diff --git a/src/doc/po/ja/complement-cheatsheet.md.po b/src/doc/po/ja/complement-cheatsheet.md.po index 3b7bb2e740d46..5b93a34cfb987 100644 --- a/src/doc/po/ja/complement-cheatsheet.md.po +++ b/src/doc/po/ja/complement-cheatsheet.md.po @@ -23,7 +23,7 @@ msgstr "" #| "[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz [win-exe]: " #| "http://static.rust-lang.org/dist/rust-nightly-install.exe" msgid "" -"Use [`ToStr`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToStr." +"Use [`ToString`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToString." "html)." msgstr "" "[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz\n" @@ -34,7 +34,7 @@ msgstr "" #, fuzzy #| msgid "" #| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~" -msgid "~~~ let x: int = 42; let y: String = x.to_str(); ~~~" +msgid "~~~ let x: int = 42; let y: String = x.to_string(); ~~~" msgstr "" "~~~~\n" "let x: f64 = 4.0;\n" @@ -76,8 +76,8 @@ msgstr "" #| "[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz [win-exe]: " #| "http://static.rust-lang.org/dist/rust-nightly-install.exe" msgid "" -"Use [`ToStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait." -"ToStrRadix.html)." +"Use [`ToStringRadix`](http://static.rust-lang.org/doc/master/std/num/trait." +"ToStringRadix.html)." msgstr "" "[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz\n" "[win-exe]: http://static.rust-lang.org/dist/rust-nightly-install.exe" @@ -86,7 +86,7 @@ msgstr "" #: src/doc/complement-cheatsheet.md:29 #, fuzzy #| msgid "~~~~ use std::task::spawn;" -msgid "~~~ use std::num::ToStrRadix;" +msgid "~~~ use std::num::ToStringRadix;" msgstr "" "~~~~\n" "use std::task::spawn;" diff --git a/src/doc/po/ja/rust.md.po b/src/doc/po/ja/rust.md.po index f0aef7accb6e1..a28a62d01c267 100644 --- a/src/doc/po/ja/rust.md.po +++ b/src/doc/po/ja/rust.md.po @@ -1656,7 +1656,7 @@ msgstr "" #| msgid "~~~~ {.ignore} // main.rs extern crate world; fn main() { println(~\"hello \" + world::explore()); } ~~~~" msgid "" "impl Printable for int {\n" -" fn to_string(&self) -> String { self.to_str() }\n" +" fn to_string(&self) -> String { self.to_string() }\n" "}\n" msgstr "" "~~~~ {.ignore}\n" diff --git a/src/doc/po/ja/tutorial.md.po b/src/doc/po/ja/tutorial.md.po index 68c32ae9704a3..597cf5b7ac509 100644 --- a/src/doc/po/ja/tutorial.md.po +++ b/src/doc/po/ja/tutorial.md.po @@ -4410,9 +4410,9 @@ msgstr "" #. type: Plain text #: src/doc/tutorial.md:2528 -msgid "#[deriving(Rand, ToStr)] enum ABC { A, B, C } ~~~" +msgid "#[deriving(Rand, ToString)] enum ABC { A, B, C } ~~~" msgstr "" -"#[deriving(Rand, ToStr)]\n" +"#[deriving(Rand, ToString)]\n" "enum ABC { A, B, C }\n" "~~~" @@ -4422,15 +4422,15 @@ msgstr "" #| msgid "" #| "The full list of derivable traits is `Eq`, `TotalEq`, `Ord`, `TotalOrd`, " #| "`Encodable` `Decodable`, `Clone`, `DeepClone`, `Hash`, `Rand`, " -#| "`Zero`, and `ToStr`." +#| "`Zero`, and `ToString`." msgid "" "The full list of derivable traits is `Eq`, `TotalEq`, `Ord`, `TotalOrd`, " "`Encodable` `Decodable`, `Clone`, `DeepClone`, `Hash`, `Rand`, " -"`Default`, `Zero`, and `ToStr`." +"`Default`, `Zero`, and `ToString`." msgstr "" "実装を自動的に導出可能なトレイトは、 `Eq`, `TotalEq`, `Ord`, `TotalOrd`, " "`Encodable` `Decodable`, `Clone`, `DeepClone`, `Hash`, `Rand`, `Zero`, " -"および `ToStr` です。." +"および `ToString` です。." #. type: Plain text #: src/doc/tutorial.md:2534 diff --git a/src/doc/rust.md b/src/doc/rust.md index 6049ffab2bf73..3029182bc2ad4 100644 --- a/src/doc/rust.md +++ b/src/doc/rust.md @@ -3676,7 +3676,7 @@ trait Printable { } impl Printable for int { - fn to_string(&self) -> String { self.to_str() } + fn to_string(&self) -> String { self.to_string() } } fn print(a: Box) { diff --git a/src/etc/vim/syntax/rust.vim b/src/etc/vim/syntax/rust.vim index a0488cdb05ab4..41bdb88cdef70 100644 --- a/src/etc/vim/syntax/rust.vim +++ b/src/etc/vim/syntax/rust.vim @@ -98,7 +98,7 @@ syn keyword rustTrait RawPtr syn keyword rustTrait Buffer Writer Reader Seek syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned syn keyword rustTrait StrAllocating -syn keyword rustTrait ToStr IntoStr +syn keyword rustTrait ToString IntoStr syn keyword rustTrait Tuple1 Tuple2 Tuple3 Tuple4 syn keyword rustTrait Tuple5 Tuple6 Tuple7 Tuple8 syn keyword rustTrait Tuple9 Tuple10 Tuple11 Tuple12 diff --git a/src/libcollections/bitv.rs b/src/libcollections/bitv.rs index 572178bd19664..b43e9e9b9610a 100644 --- a/src/libcollections/bitv.rs +++ b/src/libcollections/bitv.rs @@ -243,17 +243,17 @@ enum Op {Union, Intersect, Assign, Difference} /// bv.set(3, true); /// bv.set(5, true); /// bv.set(7, true); -/// println!("{}", bv.to_str()); +/// println!("{}", bv.to_string()); /// println!("total bits set to true: {}", bv.iter().filter(|x| *x).count()); /// /// // flip all values in bitvector, producing non-primes less than 10 /// bv.negate(); -/// println!("{}", bv.to_str()); +/// println!("{}", bv.to_string()); /// println!("total bits set to true: {}", bv.iter().filter(|x| *x).count()); /// /// // reset bitvector to empty /// bv.clear(); -/// println!("{}", bv.to_str()); +/// println!("{}", bv.to_string()); /// println!("total bits set to true: {}", bv.iter().filter(|x| *x).count()); /// ``` #[deriving(Clone)] @@ -1024,12 +1024,12 @@ mod tests { static BENCH_BITS : uint = 1 << 14; #[test] - fn test_to_str() { + fn test_to_string() { let zerolen = Bitv::new(0u, false); - assert_eq!(zerolen.to_str().as_slice(), ""); + assert_eq!(zerolen.to_string().as_slice(), ""); let eightbits = Bitv::new(8u, false); - assert_eq!(eightbits.to_str().as_slice(), "00000000") + assert_eq!(eightbits.to_string().as_slice(), "00000000") } #[test] @@ -1052,7 +1052,7 @@ mod tests { let mut b = bitv::Bitv::new(2, false); b.set(0, true); b.set(1, false); - assert_eq!(b.to_str().as_slice(), "10"); + assert_eq!(b.to_string().as_slice(), "10"); } #[test] @@ -1363,7 +1363,7 @@ mod tests { fn test_from_bytes() { let bitv = from_bytes([0b10110110, 0b00000000, 0b11111111]); let str = format!("{}{}{}", "10110110", "00000000", "11111111"); - assert_eq!(bitv.to_str().as_slice(), str.as_slice()); + assert_eq!(bitv.to_string().as_slice(), str.as_slice()); } #[test] @@ -1380,7 +1380,7 @@ mod tests { #[test] fn test_from_bools() { - assert!(from_bools([true, false, true, true]).to_str().as_slice() == + assert!(from_bools([true, false, true, true]).to_string().as_slice() == "1011"); } @@ -1674,7 +1674,7 @@ mod tests { s.insert(10); s.insert(50); s.insert(2); - assert_eq!("{1, 2, 10, 50}".to_string(), s.to_str()); + assert_eq!("{1, 2, 10, 50}".to_string(), s.to_string()); } fn rng() -> rand::IsaacRng { diff --git a/src/libcollections/btree.rs b/src/libcollections/btree.rs index 82abe69a63996..e1c0e4692af78 100644 --- a/src/libcollections/btree.rs +++ b/src/libcollections/btree.rs @@ -787,7 +787,7 @@ mod test_btree { fn insert_test_one() { let b = BTree::new(1, "abc".to_string(), 2); let is_insert = b.insert(2, "xyz".to_string()); - //println!("{}", is_insert.clone().to_str()); + //println!("{}", is_insert.clone().to_string()); assert!(is_insert.root.is_leaf()); } @@ -798,7 +798,7 @@ mod test_btree { let leaf_elt_3 = LeafElt::new(3, "ccc".to_string()); let n = Node::new_leaf(vec!(leaf_elt_1, leaf_elt_2, leaf_elt_3)); let b = BTree::new_with_node_len(n, 3, 2); - //println!("{}", b.clone().insert(4, "ddd".to_string()).to_str()); + //println!("{}", b.clone().insert(4, "ddd".to_string()).to_string()); assert!(b.insert(4, "ddd".to_string()).root.is_leaf()); } @@ -810,7 +810,7 @@ mod test_btree { let leaf_elt_4 = LeafElt::new(4, "ddd".to_string()); let n = Node::new_leaf(vec!(leaf_elt_1, leaf_elt_2, leaf_elt_3, leaf_elt_4)); let b = BTree::new_with_node_len(n, 3, 2); - //println!("{}", b.clone().insert(5, "eee".to_string()).to_str()); + //println!("{}", b.clone().insert(5, "eee".to_string()).to_string()); assert!(!b.insert(5, "eee".to_string()).root.is_leaf()); } @@ -827,7 +827,7 @@ mod test_btree { b = b.clone().insert(7, "ggg".to_string()); b = b.clone().insert(8, "hhh".to_string()); b = b.clone().insert(0, "omg".to_string()); - //println!("{}", b.clone().to_str()); + //println!("{}", b.clone().to_string()); assert!(!b.root.is_leaf()); } @@ -905,11 +905,11 @@ mod test_btree { assert!(&b2.cmp(&b) == &Greater) } - //Tests the BTree's to_str() method. + //Tests the BTree's to_string() method. #[test] fn btree_tostr_test() { let b = BTree::new(1, "abc".to_string(), 2); - assert_eq!(b.to_str(), "Key: 1, value: abc;".to_string()) + assert_eq!(b.to_string(), "Key: 1, value: abc;".to_string()) } } diff --git a/src/libcollections/dlist.rs b/src/libcollections/dlist.rs index ac8c5c5557ed9..2418968f73baf 100644 --- a/src/libcollections/dlist.rs +++ b/src/libcollections/dlist.rs @@ -1050,12 +1050,12 @@ mod tests { #[test] fn test_show() { let list: DList = range(0, 10).collect(); - assert!(list.to_str().as_slice() == "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"); + assert!(list.to_string().as_slice() == "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]"); let list: DList<&str> = vec!["just", "one", "test", "more"].iter() .map(|&s| s) .collect(); - assert!(list.to_str().as_slice() == "[just, one, test, more]"); + assert!(list.to_string().as_slice() == "[just, one, test, more]"); } #[cfg(test)] diff --git a/src/libcollections/hash/sip.rs b/src/libcollections/hash/sip.rs index 887b0fb0b8abe..c8428d35d9874 100644 --- a/src/libcollections/hash/sip.rs +++ b/src/libcollections/hash/sip.rs @@ -271,7 +271,7 @@ pub fn hash_with_keys>(k0: u64, k1: u64, value: &T) -> u64 { mod tests { use test::Bencher; use std::prelude::*; - use std::num::ToStrRadix; + use std::num::ToStringRadix; use str::Str; use string::String; diff --git a/src/libcollections/smallintmap.rs b/src/libcollections/smallintmap.rs index 4ae30348c3a92..8939a3b90d483 100644 --- a/src/libcollections/smallintmap.rs +++ b/src/libcollections/smallintmap.rs @@ -491,7 +491,7 @@ mod test_map { map.insert(1, 2); map.insert(3, 4); - let map_str = map.to_str(); + let map_str = map.to_string(); let map_str = map_str.as_slice(); assert!(map_str == "{1: 2, 3: 4}" || map_str == "{3: 4, 1: 2}"); assert_eq!(format!("{}", empty), "{}".to_string()); diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index 642e7cfc9a36f..135b5275a7bf0 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -2117,7 +2117,7 @@ mod tests { let s = Slice("abcde"); assert_eq!(s.len(), 5); assert_eq!(s.as_slice(), "abcde"); - assert_eq!(s.to_str().as_slice(), "abcde"); + assert_eq!(s.to_string().as_slice(), "abcde"); assert_eq!(format!("{}", s).as_slice(), "abcde"); assert!(s.lt(&Owned("bcdef".to_string()))); assert_eq!(Slice(""), Default::default()); @@ -2125,7 +2125,7 @@ mod tests { let o = Owned("abcde".to_string()); assert_eq!(o.len(), 5); assert_eq!(o.as_slice(), "abcde"); - assert_eq!(o.to_str().as_slice(), "abcde"); + assert_eq!(o.to_string().as_slice(), "abcde"); assert_eq!(format!("{}", o).as_slice(), "abcde"); assert!(o.lt(&Slice("bcdef"))); assert_eq!(Owned("".to_string()), Default::default()); diff --git a/src/libcore/any.rs b/src/libcore/any.rs index 2657cd5348372..4e7ed4628241f 100644 --- a/src/libcore/any.rs +++ b/src/libcore/any.rs @@ -248,11 +248,11 @@ mod tests { #[test] fn test_show() { - use realstd::to_str::ToStr; + use realstd::to_str::ToString; let a = box 8u as Box<::realstd::any::Any>; let b = box Test as Box<::realstd::any::Any>; - let a_str = a.to_str(); - let b_str = b.to_str(); + let a_str = a.to_string(); + let b_str = b.to_string(); assert_eq!(a_str.as_slice(), "Box"); assert_eq!(b_str.as_slice(), "Box"); diff --git a/src/libcore/bool.rs b/src/libcore/bool.rs index 146f29dd9f1da..94a07175d0366 100644 --- a/src/libcore/bool.rs +++ b/src/libcore/bool.rs @@ -100,10 +100,10 @@ mod tests { } #[test] - fn test_to_str() { - let s = false.to_str(); + fn test_to_string() { + let s = false.to_string(); assert_eq!(s.as_slice(), "false"); - let s = true.to_str(); + let s = true.to_string(); assert_eq!(s.as_slice(), "true"); } diff --git a/src/libcore/char.rs b/src/libcore/char.rs index 76ff56a77a48d..bea3ada5f9533 100644 --- a/src/libcore/char.rs +++ b/src/libcore/char.rs @@ -769,9 +769,9 @@ mod test { } #[test] - fn test_to_str() { - use realstd::to_str::ToStr; - let s = 't'.to_str(); + fn test_to_string() { + use realstd::to_str::ToString; + let s = 't'.to_string(); assert_eq!(s.as_slice(), "t"); } diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs index f326195be1607..ef5b51fd00b3f 100644 --- a/src/libcore/fmt/float.rs +++ b/src/libcore/fmt/float.rs @@ -70,7 +70,7 @@ static DIGIT_E_RADIX: uint = ('e' as uint) - ('a' as uint) + 11u; /** * Converts a number to its string representation as a byte vector. * This is meant to be a common base implementation for all numeric string - * conversion functions like `to_str()` or `to_str_radix()`. + * conversion functions like `to_string()` or `to_str_radix()`. * * # Arguments * - `num` - The number to convert. Accepts any number that diff --git a/src/libdebug/fmt.rs b/src/libdebug/fmt.rs index 4087cb9527168..0b04a07ea888a 100644 --- a/src/libdebug/fmt.rs +++ b/src/libdebug/fmt.rs @@ -45,7 +45,7 @@ impl Poly for T { // If we have a specified width for formatting, then we have to make // this allocation of a new string _ => { - let s = repr::repr_to_str(self); + let s = repr::repr_to_string(self); f.pad(s.as_slice()) } } diff --git a/src/libdebug/repr.rs b/src/libdebug/repr.rs index 4744d92436f2b..d2fe6ecc13ba6 100644 --- a/src/libdebug/repr.rs +++ b/src/libdebug/repr.rs @@ -73,7 +73,7 @@ int_repr!(u64, "u64") macro_rules! num_repr(($ty:ident, $suffix:expr) => (impl Repr for $ty { fn write_repr(&self, writer: &mut io::Writer) -> io::IoResult<()> { - let s = self.to_str(); + let s = self.to_string(); writer.write(s.as_bytes()).and_then(|()| { writer.write($suffix) }) diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs index 0981820533ddf..7e344a30b8827 100644 --- a/src/libgetopts/lib.rs +++ b/src/libgetopts/lib.rs @@ -61,7 +61,7 @@ //! ]; //! let matches = match getopts(args.tail(), opts) { //! Ok(m) => { m } -//! Err(f) => { fail!(f.to_str()) } +//! Err(f) => { fail!(f.to_string()) } //! }; //! if matches.opt_present("h") { //! print_usage(program.as_slice(), opts); @@ -222,9 +222,9 @@ impl Name { } } - fn to_str(&self) -> String { + fn to_string(&self) -> String { match *self { - Short(ch) => ch.to_str(), + Short(ch) => ch.to_string(), Long(ref s) => s.to_string() } } @@ -501,7 +501,7 @@ impl Fail_ { /// Convert a `Fail_` enum into an error string. #[deprecated="use `Show` (`{}` format specifier)"] pub fn to_err_msg(self) -> String { - self.to_str() + self.to_string() } } @@ -609,12 +609,12 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result { name_pos += 1; let optid = match find_opt(opts.as_slice(), (*nm).clone()) { Some(id) => id, - None => return Err(UnrecognizedOption(nm.to_str())) + None => return Err(UnrecognizedOption(nm.to_string())) }; match opts.get(optid).hasarg { No => { if !i_arg.is_none() { - return Err(UnexpectedArgument(nm.to_str())); + return Err(UnexpectedArgument(nm.to_string())); } vals.get_mut(optid).push(Given); } @@ -635,7 +635,7 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result { if !i_arg.is_none() { vals.get_mut(optid).push(Val(i_arg.clone().unwrap())); } else if i + 1 == l { - return Err(ArgumentMissing(nm.to_str())); + return Err(ArgumentMissing(nm.to_string())); } else { i += 1; vals.get_mut(optid).push(Val(args[i].clone())); @@ -652,12 +652,12 @@ pub fn getopts(args: &[String], optgrps: &[OptGroup]) -> Result { let occ = opts.get(i).occur; if occ == Req { if n == 0 { - return Err(OptionMissing(opts.get(i).name.to_str())); + return Err(OptionMissing(opts.get(i).name.to_string())); } } if occ != Multi { if n > 1 { - return Err(OptionDuplicated(opts.get(i).name.to_str())); + return Err(OptionDuplicated(opts.get(i).name.to_string())); } } i += 1; diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs index 495acdbab6260..1f1f699ff77da 100644 --- a/src/libglob/lib.rs +++ b/src/libglob/lib.rs @@ -701,11 +701,11 @@ mod test { for &p in pats.iter() { let pat = Pattern::new(p); for c in "abcdefghijklmnopqrstuvwxyz".chars() { - assert!(pat.matches(c.to_str().as_slice())); + assert!(pat.matches(c.to_string().as_slice())); } for c in "ABCDEFGHIJKLMNOPQRSTUVWXYZ".chars() { let options = MatchOptions {case_sensitive: false, .. MatchOptions::new()}; - assert!(pat.matches_with(c.to_str().as_slice(), options)); + assert!(pat.matches_with(c.to_string().as_slice(), options)); } assert!(pat.matches("1")); assert!(pat.matches("2")); diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs index 13342633f4c23..df00690ee2ae9 100644 --- a/src/libgraphviz/lib.rs +++ b/src/libgraphviz/lib.rs @@ -666,7 +666,7 @@ mod tests { let mut writer = MemWriter::new(); render(&g, &mut writer).unwrap(); let mut r = BufReader::new(writer.get_ref()); - match r.read_to_str() { + match r.read_to_string() { Ok(string) => Ok(string.to_string()), Err(err) => Err(err), } @@ -768,7 +768,7 @@ r#"digraph hasse_diagram { render(&g, &mut writer).unwrap(); let mut r = BufReader::new(writer.get_ref()); - let r = r.read_to_str(); + let r = r.read_to_string(); assert_eq!(r.unwrap().as_slice(), r#"digraph syntax_tree { diff --git a/src/libnative/io/file_win32.rs b/src/libnative/io/file_win32.rs index cd9abc70a4ee8..b6b923d9fb9f1 100644 --- a/src/libnative/io/file_win32.rs +++ b/src/libnative/io/file_win32.rs @@ -259,7 +259,7 @@ pub fn to_utf16(s: &CString) -> IoResult> { None => Err(IoError { code: libc::ERROR_INVALID_NAME as uint, extra: 0, - detail: Some("valid unicode input required".to_str()), + detail: Some("valid unicode input required".to_string()), }) } } diff --git a/src/libnative/io/pipe_unix.rs b/src/libnative/io/pipe_unix.rs index db0d1743c7279..aed37652c545a 100644 --- a/src/libnative/io/pipe_unix.rs +++ b/src/libnative/io/pipe_unix.rs @@ -43,7 +43,7 @@ fn addr_to_sockaddr_un(addr: &CString) -> IoResult<(libc::sockaddr_storage, uint return Err(IoError { code: ERROR as uint, extra: 0, - detail: Some("path must be smaller than SUN_LEN".to_str()), + detail: Some("path must be smaller than SUN_LEN".to_string()), }) } s.sun_family = libc::AF_UNIX as libc::sa_family_t; diff --git a/src/libnative/io/pipe_win32.rs b/src/libnative/io/pipe_win32.rs index 5d9ddb1f59c15..a52fdbf34745c 100644 --- a/src/libnative/io/pipe_win32.rs +++ b/src/libnative/io/pipe_win32.rs @@ -479,7 +479,7 @@ impl rtio::RtioPipe for UnixStream { Err(IoError { code: libc::ERROR_OPERATION_ABORTED as uint, extra: amt, - detail: Some("short write during write".to_str()), + detail: Some("short write during write".to_string()), }) } else { Err(util::timeout("write timed out")) diff --git a/src/libnative/io/process.rs b/src/libnative/io/process.rs index c421dada205fc..827bcabc6d82a 100644 --- a/src/libnative/io/process.rs +++ b/src/libnative/io/process.rs @@ -170,7 +170,7 @@ impl rtio::RtioProcess for Process { Some(..) => return Err(IoError { code: ERROR as uint, extra: 0, - detail: Some("can't kill an exited process".to_str()), + detail: Some("can't kill an exited process".to_string()), }), None => {} } @@ -299,7 +299,7 @@ fn spawn_process_os(cfg: ProcessConfig, return Err(IoError { code: libc::ERROR_CALL_NOT_IMPLEMENTED as uint, extra: 0, - detail: Some("unsupported gid/uid requested on windows".to_str()), + detail: Some("unsupported gid/uid requested on windows".to_string()), }) } diff --git a/src/libnative/io/util.rs b/src/libnative/io/util.rs index a3c5349fa4582..1b18f7c916f3f 100644 --- a/src/libnative/io/util.rs +++ b/src/libnative/io/util.rs @@ -30,7 +30,7 @@ pub fn timeout(desc: &'static str) -> IoError { IoError { code: ERROR as uint, extra: 0, - detail: Some(desc.to_str()), + detail: Some(desc.to_string()), } } @@ -40,7 +40,7 @@ pub fn short_write(n: uint, desc: &'static str) -> IoError { IoError { code: ERROR as uint, extra: n, - detail: Some(desc.to_str()), + detail: Some(desc.to_string()), } } diff --git a/src/libnum/bigint.rs b/src/libnum/bigint.rs index e9153f89e04ee..e7039750b4be4 100644 --- a/src/libnum/bigint.rs +++ b/src/libnum/bigint.rs @@ -24,7 +24,7 @@ use std::default::Default; use std::from_str::FromStr; use std::num::CheckedDiv; use std::num::{ToPrimitive, FromPrimitive}; -use std::num::{Zero, One, ToStrRadix, FromStrRadix}; +use std::num::{Zero, One, ToStringRadix, FromStrRadix}; use std::string::String; use std::{uint, i64, u64}; @@ -601,7 +601,7 @@ impl_to_biguint!(u16, FromPrimitive::from_u16) impl_to_biguint!(u32, FromPrimitive::from_u32) impl_to_biguint!(u64, FromPrimitive::from_u64) -impl ToStrRadix for BigUint { +impl ToStringRadix for BigUint { fn to_str_radix(&self, radix: uint) -> String { assert!(1 < radix && radix <= 16, "The radix must be within (1, 16]"); let (base, max_len) = get_radix_base(radix); @@ -1205,7 +1205,7 @@ impl_to_bigint!(u16, FromPrimitive::from_u16) impl_to_bigint!(u32, FromPrimitive::from_u32) impl_to_bigint!(u64, FromPrimitive::from_u64) -impl ToStrRadix for BigInt { +impl ToStringRadix for BigInt { #[inline] fn to_str_radix(&self, radix: uint) -> String { match self.sign { @@ -1368,7 +1368,7 @@ mod biguint_tests { use std::cmp::{Less, Equal, Greater}; use std::from_str::FromStr; use std::i64; - use std::num::{Zero, One, FromStrRadix, ToStrRadix}; + use std::num::{Zero, One, FromStrRadix, ToStringRadix}; use std::num::{ToPrimitive, FromPrimitive}; use std::num::CheckedDiv; use std::rand::task_rng; @@ -2217,7 +2217,7 @@ mod bigint_tests { use std::cmp::{Less, Equal, Greater}; use std::i64; use std::num::CheckedDiv; - use std::num::{Zero, One, FromStrRadix, ToStrRadix}; + use std::num::{Zero, One, FromStrRadix, ToStringRadix}; use std::num::{ToPrimitive, FromPrimitive}; use std::rand::task_rng; use std::u64; @@ -2737,7 +2737,7 @@ mod bigint_tests { // attempt to allocate a vector of size (-1u) == huge. let x: BigInt = from_str(format!("1{}", "0".repeat(36)).as_slice()).unwrap(); - let _y = x.to_str(); + let _y = x.to_string(); } #[test] @@ -2842,14 +2842,14 @@ mod bench { } #[bench] - fn to_str(b: &mut Bencher) { + fn to_string(b: &mut Bencher) { let fac = factorial(100); let fib = fib(100); b.iter(|| { - fac.to_str(); + fac.to_string(); }); b.iter(|| { - fib.to_str(); + fib.to_string(); }); } diff --git a/src/libnum/complex.rs b/src/libnum/complex.rs index 9ee80d283cf92..a9b208b4519d3 100644 --- a/src/libnum/complex.rs +++ b/src/libnum/complex.rs @@ -12,7 +12,7 @@ //! Complex numbers. use std::fmt; -use std::num::{Zero,One,ToStrRadix}; +use std::num::{Zero,One,ToStringRadix}; // FIXME #1284: handle complex NaN & infinity etc. This // probably doesn't map to C's _Complex correctly. @@ -174,7 +174,7 @@ impl fmt::Show for Complex { } } -impl ToStrRadix for Complex { +impl ToStringRadix for Complex { fn to_str_radix(&self, radix: uint) -> String { if self.im < Zero::zero() { format!("{}-{}i", @@ -347,9 +347,9 @@ mod test { } #[test] - fn test_to_str() { + fn test_to_string() { fn test(c : Complex64, s: String) { - assert_eq!(c.to_str(), s); + assert_eq!(c.to_string(), s); } test(_0_0i, "0+0i".to_string()); test(_1_0i, "1+0i".to_string()); diff --git a/src/libnum/rational.rs b/src/libnum/rational.rs index faf05365c04a0..c88e44dcc1ec5 100644 --- a/src/libnum/rational.rs +++ b/src/libnum/rational.rs @@ -15,7 +15,7 @@ use Integer; use std::cmp; use std::fmt; use std::from_str::FromStr; -use std::num::{Zero, One, ToStrRadix, FromStrRadix}; +use std::num::{Zero, One, ToStringRadix, FromStrRadix}; use bigint::{BigInt, BigUint, Sign, Plus, Minus}; /// Represents the ratio between 2 numbers. @@ -279,7 +279,7 @@ impl fmt::Show for Ratio { write!(f, "{}/{}", self.numer, self.denom) } } -impl ToStrRadix for Ratio { +impl ToStringRadix for Ratio { /// Renders as `numer/denom` where the numbers are in base `radix`. fn to_str_radix(&self, radix: uint) -> String { format!("{}/{}", @@ -331,7 +331,7 @@ impl mod test { use super::{Ratio, Rational, BigRational}; - use std::num::{Zero, One, FromStrRadix, FromPrimitive, ToStrRadix}; + use std::num::{Zero, One, FromStrRadix, FromPrimitive, ToStringRadix}; use std::from_str::FromStr; pub static _0 : Rational = Ratio { numer: 0, denom: 1}; @@ -559,7 +559,7 @@ mod test { fn test_to_from_str() { fn test(r: Rational, s: String) { assert_eq!(FromStr::from_str(s.as_slice()), Some(r)); - assert_eq!(r.to_str(), s); + assert_eq!(r.to_string(), s); } test(_1, "1/1".to_string()); test(_0, "0/1".to_string()); diff --git a/src/libregex_macros/lib.rs b/src/libregex_macros/lib.rs index ff5cada05ea2e..c604011dfd426 100644 --- a/src/libregex_macros/lib.rs +++ b/src/libregex_macros/lib.rs @@ -86,7 +86,7 @@ fn native(cx: &mut ExtCtxt, sp: codemap::Span, tts: &[ast::TokenTree]) let re = match Regex::new(regex.as_slice()) { Ok(re) => re, Err(err) => { - cx.span_err(sp, err.to_str().as_slice()); + cx.span_err(sp, err.to_string().as_slice()); return DummyResult::any(sp) } }; @@ -621,11 +621,11 @@ fn parse(cx: &mut ExtCtxt, tts: &[ast::TokenTree]) -> Option { let regex = match entry.node { ast::ExprLit(lit) => { match lit.node { - ast::LitStr(ref s, _) => s.to_str(), + ast::LitStr(ref s, _) => s.to_string(), _ => { cx.span_err(entry.span, format!( "expected string literal but got `{}`", - pprust::lit_to_str(lit)).as_slice()); + pprust::lit_to_string(lit)).as_slice()); return None } } @@ -633,7 +633,7 @@ fn parse(cx: &mut ExtCtxt, tts: &[ast::TokenTree]) -> Option { _ => { cx.span_err(entry.span, format!( "expected string literal but got `{}`", - pprust::expr_to_str(entry)).as_slice()); + pprust::expr_to_string(entry)).as_slice()); return None } }; diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index d644a0cc35330..a9ad0452e4743 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -749,7 +749,7 @@ pub fn mangle_exported_name(ccx: &CrateContext, path: PathElems, pub fn mangle_internal_name_by_type_and_seq(ccx: &CrateContext, t: ty::t, name: &str) -> String { - let s = ppaux::ty_to_str(ccx.tcx(), t); + let s = ppaux::ty_to_string(ccx.tcx(), t); let path = [PathName(token::intern(s.as_slice())), gensym_name(name)]; let hash = get_symbol_hash(ccx, t); diff --git a/src/librustc/back/svh.rs b/src/librustc/back/svh.rs index ef3a00c26f204..5971dc5972393 100644 --- a/src/librustc/back/svh.rs +++ b/src/librustc/back/svh.rs @@ -334,13 +334,13 @@ mod svh_visitor { // trees might be faster. Implementing this is far // easier in short term. let macro_defn_as_string = - pprust::to_str(|pp_state| pp_state.print_mac(macro)); + pprust::to_string(|pp_state| pp_state.print_mac(macro)); macro_defn_as_string.hash(self.st); } else { // It is not possible to observe any kind of macro // invocation at this stage except `macro_rules!`. fail!("reached macro somehow: {}", - pprust::to_str(|pp_state| pp_state.print_mac(macro))); + pprust::to_string(|pp_state| pp_state.print_mac(macro))); } visit::walk_mac(self, macro, e); diff --git a/src/librustc/driver/config.rs b/src/librustc/driver/config.rs index db96330d656fe..c385ec9dceffd 100644 --- a/src/librustc/driver/config.rs +++ b/src/librustc/driver/config.rs @@ -586,10 +586,10 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options { let mut lint_opts = Vec::new(); let lint_dict = lint::get_lint_dict(); for level in lint_levels.iter() { - let level_name = lint::level_to_str(*level); + let level_name = lint::level_to_string(*level); let level_short = level_name.slice_chars(0, 1); - let level_short = level_short.to_ascii().to_upper().into_str(); + let level_short = level_short.to_ascii().to_upper().into_string(); let flags = matches.opt_strs(level_short.as_slice()) .move_iter() .collect::>() diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index ac6558aef651f..91d3e921373fa 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -567,7 +567,7 @@ impl pprust::PpAnn for IdentifiedAnnotation { match node { pprust::NodeItem(item) => { try!(pp::space(&mut s.s)); - s.synth_comment(item.id.to_str()) + s.synth_comment(item.id.to_string()) } pprust::NodeBlock(blk) => { try!(pp::space(&mut s.s)); @@ -575,7 +575,7 @@ impl pprust::PpAnn for IdentifiedAnnotation { } pprust::NodeExpr(expr) => { try!(pp::space(&mut s.s)); - try!(s.synth_comment(expr.id.to_str())); + try!(s.synth_comment(expr.id.to_string())); s.pclose() } pprust::NodePat(pat) => { @@ -609,7 +609,7 @@ impl pprust::PpAnn for TypedAnnotation { try!(pp::word(&mut s.s, "as")); try!(pp::space(&mut s.s)); try!(pp::word(&mut s.s, - ppaux::ty_to_str( + ppaux::ty_to_string( tcx, ty::expr_ty(tcx, expr)).as_slice())); s.pclose() diff --git a/src/librustc/driver/mod.rs b/src/librustc/driver/mod.rs index f55fd78762c5d..582835cdf7132 100644 --- a/src/librustc/driver/mod.rs +++ b/src/librustc/driver/mod.rs @@ -155,7 +155,7 @@ Available lint options: let name = name.replace("_", "-"); println!(" {} {:7.7s} {}", padded(max_key, name.as_slice()), - lint::level_to_str(spec.default), + lint::level_to_string(spec.default), spec.desc); } println!(""); @@ -205,7 +205,7 @@ pub fn handle_options(mut args: Vec) -> Option { match getopts::getopts(args.as_slice(), config::optgroups().as_slice()) { Ok(m) => m, Err(f) => { - early_error(f.to_str().as_slice()); + early_error(f.to_string().as_slice()); } }; @@ -264,7 +264,7 @@ fn print_crate_info(sess: &Session, t_outputs.out_filestem.as_slice()); if crate_id { - println!("{}", id.to_str()); + println!("{}", id.to_string()); } if crate_name { println!("{}", id.name); @@ -404,7 +404,7 @@ fn monitor(f: proc():Send) { emitter.emit(None, note.as_slice(), diagnostic::Note) } - match r.read_to_str() { + match r.read_to_string() { Ok(s) => println!("{}", s), Err(e) => { emitter.emit(None, diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs index d33b76ae08c5e..cbf005e5f3c9f 100644 --- a/src/librustc/front/test.rs +++ b/src/librustc/front/test.rs @@ -350,7 +350,7 @@ fn mk_test_module(cx: &TestCtxt) -> Gc { span: DUMMY_SP, }; - debug!("Synthetic test module:\n{}\n", pprust::item_to_str(&item)); + debug!("Synthetic test module:\n{}\n", pprust::item_to_string(&item)); box(GC) item } diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs index ac9cec8471526..3853bfe6d13c0 100644 --- a/src/librustc/lib/llvm.rs +++ b/src/librustc/lib/llvm.rs @@ -1737,8 +1737,8 @@ pub mod llvm { -> ValueRef; pub fn LLVMDICompositeTypeSetTypeArray(CompositeType: ValueRef, TypeArray: ValueRef); - pub fn LLVMTypeToString(Type: TypeRef) -> *c_char; - pub fn LLVMValueToString(value_ref: ValueRef) -> *c_char; + pub fn LLVMTypeToStringing(Type: TypeRef) -> *c_char; + pub fn LLVMValueToStringing(value_ref: ValueRef) -> *c_char; pub fn LLVMIsAArgument(value_ref: ValueRef) -> ValueRef; @@ -1883,23 +1883,23 @@ impl TypeNames { self.named_types.borrow().find_equiv(&s).map(|x| Type::from_ref(*x)) } - pub fn type_to_str(&self, ty: Type) -> String { + pub fn type_to_string(&self, ty: Type) -> String { unsafe { - let s = llvm::LLVMTypeToString(ty.to_ref()); + let s = llvm::LLVMTypeToStringing(ty.to_ref()); let ret = from_c_str(s); free(s as *mut c_void); ret.to_string() } } - pub fn types_to_str(&self, tys: &[Type]) -> String { - let strs: Vec = tys.iter().map(|t| self.type_to_str(*t)).collect(); + pub fn types_to_string(&self, tys: &[Type]) -> String { + let strs: Vec = tys.iter().map(|t| self.type_to_string(*t)).collect(); format!("[{}]", strs.connect(",").to_string()) } - pub fn val_to_str(&self, val: ValueRef) -> String { + pub fn val_to_string(&self, val: ValueRef) -> String { unsafe { - let s = llvm::LLVMValueToString(val); + let s = llvm::LLVMValueToStringing(val); let ret = from_c_str(s); free(s as *mut c_void); ret.to_string() diff --git a/src/librustc/metadata/creader.rs b/src/librustc/metadata/creader.rs index efe28614b8f4d..8f3e30ab5c247 100644 --- a/src/librustc/metadata/creader.rs +++ b/src/librustc/metadata/creader.rs @@ -162,7 +162,7 @@ fn extract_crate_info(e: &Env, i: &ast::ViewItem) -> Option { Some(id) => id } } - None => from_str(ident.get().to_str().as_slice()).unwrap() + None => from_str(ident.get().to_string().as_slice()).unwrap() }; Some(CrateInfo { ident: ident.get().to_string(), diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index 548a8c50501dd..546bd928b82d9 100644 --- a/src/librustc/metadata/decoder.rs +++ b/src/librustc/metadata/decoder.rs @@ -1088,7 +1088,7 @@ fn list_crate_attributes(md: ebml::Doc, hash: &Svh, let r = get_attributes(md); for attr in r.iter() { - try!(write!(out, "{}\n", pprust::attribute_to_str(attr))); + try!(write!(out, "{}\n", pprust::attribute_to_string(attr))); } write!(out, "\n\n") diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index a94ea0b98eb6a..9d6fd2f0852b7 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -102,7 +102,7 @@ fn encode_impl_type_basename(ebml_w: &mut Encoder, name: Ident) { } pub fn encode_def_id(ebml_w: &mut Encoder, id: DefId) { - ebml_w.wr_tagged_str(tag_def_id, def_to_str(id).as_slice()); + ebml_w.wr_tagged_str(tag_def_id, def_to_string(id).as_slice()); } #[deriving(Clone)] @@ -142,7 +142,7 @@ fn encode_family(ebml_w: &mut Encoder, c: char) { ebml_w.end_tag(); } -pub fn def_to_str(did: DefId) -> String { +pub fn def_to_string(did: DefId) -> String { format!("{}:{}", did.krate, did.node) } @@ -173,7 +173,7 @@ fn encode_region_param_defs(ebml_w: &mut Encoder, ebml_w.end_tag(); ebml_w.wr_tagged_str(tag_region_param_def_def_id, - def_to_str(param.def_id).as_slice()); + def_to_string(param.def_id).as_slice()); ebml_w.wr_tagged_u64(tag_region_param_def_space, param.space.to_uint() as u64); @@ -205,7 +205,7 @@ fn encode_bounds_and_type(ebml_w: &mut Encoder, fn encode_variant_id(ebml_w: &mut Encoder, vid: DefId) { ebml_w.start_tag(tag_items_data_item_variant); - let s = def_to_str(vid); + let s = def_to_string(vid); ebml_w.writer.write(s.as_bytes()); ebml_w.end_tag(); } @@ -267,14 +267,14 @@ fn encode_disr_val(_: &EncodeContext, ebml_w: &mut Encoder, disr_val: ty::Disr) { ebml_w.start_tag(tag_disr_val); - let s = disr_val.to_str(); + let s = disr_val.to_string(); ebml_w.writer.write(s.as_bytes()); ebml_w.end_tag(); } fn encode_parent_item(ebml_w: &mut Encoder, id: DefId) { ebml_w.start_tag(tag_items_data_parent_item); - let s = def_to_str(id); + let s = def_to_string(id); ebml_w.writer.write(s.as_bytes()); ebml_w.end_tag(); } @@ -292,7 +292,7 @@ fn encode_struct_fields(ebml_w: &mut Encoder, encode_struct_field_family(ebml_w, f.vis); encode_def_id(ebml_w, f.id); ebml_w.start_tag(tag_item_field_origin); - let s = def_to_str(origin); + let s = def_to_string(origin); ebml_w.writer.write(s.as_bytes()); ebml_w.end_tag(); ebml_w.end_tag(); @@ -383,7 +383,7 @@ fn encode_reexported_static_method(ebml_w: &mut Encoder, exp.name, token::get_ident(method_ident)); ebml_w.start_tag(tag_items_data_item_reexport); ebml_w.start_tag(tag_items_data_item_reexport_def_id); - ebml_w.wr_str(def_to_str(method_def_id).as_slice()); + ebml_w.wr_str(def_to_string(method_def_id).as_slice()); ebml_w.end_tag(); ebml_w.start_tag(tag_items_data_item_reexport_name); ebml_w.wr_str(format!("{}::{}", @@ -530,7 +530,7 @@ fn encode_reexports(ecx: &EncodeContext, id); ebml_w.start_tag(tag_items_data_item_reexport); ebml_w.start_tag(tag_items_data_item_reexport_def_id); - ebml_w.wr_str(def_to_str(exp.def_id).as_slice()); + ebml_w.wr_str(def_to_string(exp.def_id).as_slice()); ebml_w.end_tag(); ebml_w.start_tag(tag_items_data_item_reexport_name); ebml_w.wr_str(exp.name.as_slice()); @@ -563,12 +563,12 @@ fn encode_info_for_mod(ecx: &EncodeContext, // Encode info about all the module children. for item in md.items.iter() { ebml_w.start_tag(tag_mod_child); - ebml_w.wr_str(def_to_str(local_def(item.id)).as_slice()); + ebml_w.wr_str(def_to_string(local_def(item.id)).as_slice()); ebml_w.end_tag(); each_auxiliary_node_id(*item, |auxiliary_node_id| { ebml_w.start_tag(tag_mod_child); - ebml_w.wr_str(def_to_str(local_def( + ebml_w.wr_str(def_to_string(local_def( auxiliary_node_id)).as_slice()); ebml_w.end_tag(); true @@ -580,10 +580,10 @@ fn encode_info_for_mod(ecx: &EncodeContext, debug!("(encoding info for module) ... encoding impl {} \ ({:?}/{:?})", token::get_ident(ident), - did, ecx.tcx.map.node_to_str(did)); + did, ecx.tcx.map.node_to_string(did)); ebml_w.start_tag(tag_mod_impl); - ebml_w.wr_str(def_to_str(local_def(did)).as_slice()); + ebml_w.wr_str(def_to_string(local_def(did)).as_slice()); ebml_w.end_tag(); } _ => {} @@ -658,7 +658,7 @@ fn encode_provided_source(ebml_w: &mut Encoder, source_opt: Option) { for source in source_opt.iter() { ebml_w.start_tag(tag_item_method_provided_source); - let s = def_to_str(*source); + let s = def_to_string(*source); ebml_w.writer.write(s.as_bytes()); ebml_w.end_tag(); } @@ -915,7 +915,7 @@ fn encode_info_for_item(ecx: &EncodeContext, } debug!("encoding info for item at {}", - ecx.tcx.sess.codemap().span_to_str(item.span)); + ecx.tcx.sess.codemap().span_to_string(item.span)); let def_id = local_def(item.id); let stab = tcx.stability.borrow().lookup_local(item.id); @@ -986,7 +986,7 @@ fn encode_info_for_item(ecx: &EncodeContext, // Encode all the items in this module. for foreign_item in fm.items.iter() { ebml_w.start_tag(tag_mod_child); - ebml_w.wr_str(def_to_str(local_def(foreign_item.id)).as_slice()); + ebml_w.wr_str(def_to_string(local_def(foreign_item.id)).as_slice()); ebml_w.end_tag(); } encode_visibility(ebml_w, vis); @@ -1109,7 +1109,7 @@ fn encode_info_for_item(ecx: &EncodeContext, } for &method_def_id in methods.iter() { ebml_w.start_tag(tag_item_impl_method); - let s = def_to_str(method_def_id); + let s = def_to_string(method_def_id); ebml_w.writer.write(s.as_bytes()); ebml_w.end_tag(); } @@ -1172,7 +1172,7 @@ fn encode_info_for_item(ecx: &EncodeContext, ebml_w.end_tag(); ebml_w.start_tag(tag_mod_child); - ebml_w.wr_str(def_to_str(method_def_id).as_slice()); + ebml_w.wr_str(def_to_string(method_def_id).as_slice()); ebml_w.end_tag(); } encode_path(ebml_w, path.clone()); @@ -1325,7 +1325,7 @@ fn my_visit_foreign_item(ni: &ForeignItem, // See above let ecx: &EncodeContext = unsafe { mem::transmute(ecx_ptr) }; debug!("writing foreign item {}::{}", - ecx.tcx.map.path_to_str(ni.id), + ecx.tcx.map.path_to_string(ni.id), token::get_ident(ni.ident)); let mut ebml_w = unsafe { @@ -1504,7 +1504,7 @@ fn synthesize_crate_attrs(ecx: &EncodeContext, InternedString::new("crate_id"), token::intern_and_get_ident(ecx.link_meta .crateid - .to_str() + .to_string() .as_slice()))) } @@ -1720,12 +1720,12 @@ fn encode_misc_info(ecx: &EncodeContext, ebml_w.start_tag(tag_misc_info_crate_items); for &item in krate.module.items.iter() { ebml_w.start_tag(tag_mod_child); - ebml_w.wr_str(def_to_str(local_def(item.id)).as_slice()); + ebml_w.wr_str(def_to_string(local_def(item.id)).as_slice()); ebml_w.end_tag(); each_auxiliary_node_id(item, |auxiliary_node_id| { ebml_w.start_tag(tag_mod_child); - ebml_w.wr_str(def_to_str(local_def( + ebml_w.wr_str(def_to_string(local_def( auxiliary_node_id)).as_slice()); ebml_w.end_tag(); true @@ -1763,7 +1763,7 @@ fn encode_crate_dep(ebml_w: &mut Encoder, dep: decoder::CrateDep) { ebml_w.start_tag(tag_crate_dep); ebml_w.start_tag(tag_crate_dep_crateid); - ebml_w.writer.write(dep.crate_id.to_str().as_bytes()); + ebml_w.writer.write(dep.crate_id.to_string().as_bytes()); ebml_w.end_tag(); ebml_w.start_tag(tag_crate_dep_hash); ebml_w.writer.write(dep.hash.as_str().as_bytes()); @@ -1779,7 +1779,7 @@ fn encode_hash(ebml_w: &mut Encoder, hash: &Svh) { fn encode_crate_id(ebml_w: &mut Encoder, crate_id: &CrateId) { ebml_w.start_tag(tag_crate_crateid); - ebml_w.writer.write(crate_id.to_str().as_bytes()); + ebml_w.writer.write(crate_id.to_string().as_bytes()); ebml_w.end_tag(); } diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index ed47649c6b22a..b9de428a6b93c 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -459,7 +459,7 @@ impl<'a> Context<'a> { } pub fn note_crateid_attr(diag: &SpanHandler, crateid: &CrateId) { - diag.handler().note(format!("crate_id: {}", crateid.to_str()).as_slice()); + diag.handler().note(format!("crate_id: {}", crateid.to_string()).as_slice()); } impl ArchiveMetadata { diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs index 8cb975182a033..191d91569616e 100644 --- a/src/librustc/middle/astencode.rs +++ b/src/librustc/middle/astencode.rs @@ -86,7 +86,7 @@ pub fn encode_inlined_item(ecx: &e::EncodeContext, e::IIMethodRef(_, _, m) => m.id, }; debug!("> Encoding inlined item: {} ({})", - ecx.tcx.map.path_to_str(id), + ecx.tcx.map.path_to_string(id), ebml_w.writer.tell()); let ii = simplify_ast(ii); @@ -99,7 +99,7 @@ pub fn encode_inlined_item(ecx: &e::EncodeContext, ebml_w.end_tag(); debug!("< Encoded inlined fn: {} ({})", - ecx.tcx.map.path_to_str(id), + ecx.tcx.map.path_to_string(id), ebml_w.writer.tell()); } @@ -119,7 +119,7 @@ pub fn decode_inlined_item(cdata: &cstore::crate_metadata, debug!("> Decoding inlined fn: {}::?", { // Do an Option dance to use the path after it is moved below. - let s = ast_map::path_to_str(ast_map::Values(path.iter())); + let s = ast_map::path_to_string(ast_map::Values(path.iter())); path_as_str = Some(s); path_as_str.as_ref().map(|x| x.as_slice()) }); @@ -147,7 +147,7 @@ pub fn decode_inlined_item(cdata: &cstore::crate_metadata, match ii { ast::IIItem(i) => { debug!(">>> DECODED ITEM >>>\n{}\n<<< DECODED ITEM <<<", - syntax::print::pprust::item_to_str(&*i)); + syntax::print::pprust::item_to_string(&*i)); } _ => { } } @@ -1391,7 +1391,7 @@ fn decode_side_tables(xcx: &ExtendedDecodeContext, c::tag_table_node_type => { let ty = val_dsr.read_ty(xcx); debug!("inserting ty for node {:?}: {}", - id, ty_to_str(dcx.tcx, ty)); + id, ty_to_string(dcx.tcx, ty)); dcx.tcx.node_types.borrow_mut().insert(id as uint, ty); } c::tag_table_item_subst => { @@ -1561,7 +1561,7 @@ fn test_simplification() { ).unwrap()); match (item_out, item_exp) { (ast::IIItem(item_out), ast::IIItem(item_exp)) => { - assert!(pprust::item_to_str(item_out) == pprust::item_to_str(item_exp)); + assert!(pprust::item_to_string(item_out) == pprust::item_to_string(item_exp)); } _ => fail!() } diff --git a/src/librustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs index df208b9cdc133..db8ab8c83fbdc 100644 --- a/src/librustc/middle/borrowck/check_loans.rs +++ b/src/librustc/middle/borrowck/check_loans.rs @@ -351,7 +351,7 @@ impl<'a> CheckLoanCtxt<'a> { "it".to_string() } else { format!("`{}`", - self.bccx.loan_path_to_str(&*old_loan.loan_path)) + self.bccx.loan_path_to_string(&*old_loan.loan_path)) }; match (new_loan.kind, old_loan.kind) { @@ -360,7 +360,7 @@ impl<'a> CheckLoanCtxt<'a> { new_loan.span, format!("cannot borrow `{}` as mutable \ more than once at a time", - self.bccx.loan_path_to_str( + self.bccx.loan_path_to_string( &*new_loan.loan_path)).as_slice()); } @@ -369,7 +369,7 @@ impl<'a> CheckLoanCtxt<'a> { new_loan.span, format!("closure requires unique access to `{}` \ but {} is already borrowed", - self.bccx.loan_path_to_str(&*new_loan.loan_path), + self.bccx.loan_path_to_string(&*new_loan.loan_path), old_pronoun).as_slice()); } @@ -378,7 +378,7 @@ impl<'a> CheckLoanCtxt<'a> { new_loan.span, format!("cannot borrow `{}` as {} because \ previous closure requires unique access", - self.bccx.loan_path_to_str(&*new_loan.loan_path), + self.bccx.loan_path_to_string(&*new_loan.loan_path), new_loan.kind.to_user_str()).as_slice()); } @@ -387,7 +387,7 @@ impl<'a> CheckLoanCtxt<'a> { new_loan.span, format!("cannot borrow `{}` as {} because \ {} is also borrowed as {}", - self.bccx.loan_path_to_str(&*new_loan.loan_path), + self.bccx.loan_path_to_string(&*new_loan.loan_path), new_loan.kind.to_user_str(), old_pronoun, old_loan.kind.to_user_str()).as_slice()); @@ -399,7 +399,7 @@ impl<'a> CheckLoanCtxt<'a> { self.bccx.span_note( span, format!("borrow occurs due to use of `{}` in closure", - self.bccx.loan_path_to_str( + self.bccx.loan_path_to_string( &*new_loan.loan_path)).as_slice()); } _ => { } @@ -410,7 +410,7 @@ impl<'a> CheckLoanCtxt<'a> { format!("the mutable borrow prevents subsequent \ moves, borrows, or modification of `{0}` \ until the borrow ends", - self.bccx.loan_path_to_str( + self.bccx.loan_path_to_string( &*old_loan.loan_path)) } @@ -418,14 +418,14 @@ impl<'a> CheckLoanCtxt<'a> { format!("the immutable borrow prevents subsequent \ moves or mutable borrows of `{0}` \ until the borrow ends", - self.bccx.loan_path_to_str(&*old_loan.loan_path)) + self.bccx.loan_path_to_string(&*old_loan.loan_path)) } ty::UniqueImmBorrow => { format!("the unique capture prevents subsequent \ moves or borrows of `{0}` \ until the borrow ends", - self.bccx.loan_path_to_str(&*old_loan.loan_path)) + self.bccx.loan_path_to_string(&*old_loan.loan_path)) } }; @@ -433,7 +433,7 @@ impl<'a> CheckLoanCtxt<'a> { euv::ClosureCapture(_) => { format!("previous borrow of `{}` occurs here due to \ use in closure", - self.bccx.loan_path_to_str(&*old_loan.loan_path)) + self.bccx.loan_path_to_string(&*old_loan.loan_path)) } euv::OverloadedOperator(..) | @@ -442,7 +442,7 @@ impl<'a> CheckLoanCtxt<'a> { euv::ClosureInvocation(..) | euv::RefBinding(..) => { format!("previous borrow of `{}` occurs here", - self.bccx.loan_path_to_str(&*old_loan.loan_path)) + self.bccx.loan_path_to_string(&*old_loan.loan_path)) } }; @@ -518,12 +518,12 @@ impl<'a> CheckLoanCtxt<'a> { self.bccx.span_err( span, format!("cannot use `{}` because it was mutably borrowed", - self.bccx.loan_path_to_str(copy_path).as_slice()) + self.bccx.loan_path_to_string(copy_path).as_slice()) .as_slice()); self.bccx.span_note( loan_span, format!("borrow of `{}` occurs here", - self.bccx.loan_path_to_str(&*loan_path).as_slice()) + self.bccx.loan_path_to_string(&*loan_path).as_slice()) .as_slice()); } } @@ -543,19 +543,19 @@ impl<'a> CheckLoanCtxt<'a> { let err_message = match move_kind { move_data::Captured => format!("cannot move `{}` into closure because it is borrowed", - self.bccx.loan_path_to_str(move_path).as_slice()), + self.bccx.loan_path_to_string(move_path).as_slice()), move_data::Declared | move_data::MoveExpr | move_data::MovePat => format!("cannot move out of `{}` because it is borrowed", - self.bccx.loan_path_to_str(move_path).as_slice()) + self.bccx.loan_path_to_string(move_path).as_slice()) }; self.bccx.span_err(span, err_message.as_slice()); self.bccx.span_note( loan_span, format!("borrow of `{}` occurs here", - self.bccx.loan_path_to_str(&*loan_path).as_slice()) + self.bccx.loan_path_to_string(&*loan_path).as_slice()) .as_slice()); } } @@ -567,7 +567,7 @@ impl<'a> CheckLoanCtxt<'a> { borrow_kind: ty::BorrowKind) -> UseError { debug!("analyze_restrictions_on_use(expr_id={:?}, use_path={})", - self.tcx().map.node_to_str(expr_id), + self.tcx().map.node_to_string(expr_id), use_path.repr(self.tcx())); let mut ret = UseOk; @@ -690,15 +690,15 @@ impl<'a> CheckLoanCtxt<'a> { assignment_span, format!("cannot assign to {} {} `{}`", assignee_cmt.mutbl.to_user_str(), - self.bccx.cmt_to_str(&*assignee_cmt), - self.bccx.loan_path_to_str(&*lp)).as_slice()); + self.bccx.cmt_to_string(&*assignee_cmt), + self.bccx.loan_path_to_string(&*lp)).as_slice()); } None => { self.bccx.span_err( assignment_span, format!("cannot assign to {} {}", assignee_cmt.mutbl.to_user_str(), - self.bccx.cmt_to_str(&*assignee_cmt)).as_slice()); + self.bccx.cmt_to_string(&*assignee_cmt)).as_slice()); } } return; @@ -824,10 +824,10 @@ impl<'a> CheckLoanCtxt<'a> { self.bccx.span_err( span, format!("cannot assign to `{}` because it is borrowed", - self.bccx.loan_path_to_str(loan_path)).as_slice()); + self.bccx.loan_path_to_string(loan_path)).as_slice()); self.bccx.span_note( loan.span, format!("borrow of `{}` occurs here", - self.bccx.loan_path_to_str(loan_path)).as_slice()); + self.bccx.loan_path_to_string(loan_path)).as_slice()); } } diff --git a/src/librustc/middle/borrowck/gather_loans/move_error.rs b/src/librustc/middle/borrowck/gather_loans/move_error.rs index 925244849bc8a..5978e104eb3d6 100644 --- a/src/librustc/middle/borrowck/gather_loans/move_error.rs +++ b/src/librustc/middle/borrowck/gather_loans/move_error.rs @@ -131,7 +131,7 @@ fn report_cannot_move_out_of(bccx: &BorrowckCtxt, move_from: mc::cmt) { bccx.span_err( move_from.span, format!("cannot move out of {}", - bccx.cmt_to_str(&*move_from)).as_slice()); + bccx.cmt_to_string(&*move_from)).as_slice()); } mc::cat_downcast(ref b) | @@ -156,7 +156,7 @@ fn note_move_destination(bccx: &BorrowckCtxt, move_to_span: codemap::Span, pat_ident_path: &ast::Path, is_first_note: bool) { - let pat_name = pprust::path_to_str(pat_ident_path); + let pat_name = pprust::path_to_string(pat_ident_path); if is_first_note { bccx.span_note( move_to_span, diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs index 0c77e63779074..cb7ba81c7edf6 100644 --- a/src/librustc/middle/borrowck/mod.rs +++ b/src/librustc/middle/borrowck/mod.rs @@ -418,7 +418,7 @@ impl<'a> BorrowckCtxt<'a> { pub fn report(&self, err: BckError) { self.span_err( err.span, - self.bckerr_to_str(&err).as_slice()); + self.bckerr_to_string(&err).as_slice()); self.note_and_explain_bckerr(err); } @@ -439,7 +439,7 @@ impl<'a> BorrowckCtxt<'a> { use_span, format!("{} of possibly uninitialized variable: `{}`", verb, - self.loan_path_to_str(lp)).as_slice()); + self.loan_path_to_string(lp)).as_slice()); } _ => { let partially = if lp == moved_lp {""} else {"partially "}; @@ -448,7 +448,7 @@ impl<'a> BorrowckCtxt<'a> { format!("{} of {}moved value: `{}`", verb, partially, - self.loan_path_to_str(lp)).as_slice()); + self.loan_path_to_string(lp)).as_slice()); } } @@ -472,7 +472,7 @@ impl<'a> BorrowckCtxt<'a> { self.tcx.sess.span_note( expr_span, format!("`{}` moved here because it has type `{}`, which is {}", - self.loan_path_to_str(moved_lp), + self.loan_path_to_string(moved_lp), expr_ty.user_string(self.tcx), suggestion).as_slice()); } @@ -483,7 +483,7 @@ impl<'a> BorrowckCtxt<'a> { format!("`{}` moved here because it has type `{}`, \ which is moved by default (use `ref` to \ override)", - self.loan_path_to_str(moved_lp), + self.loan_path_to_string(moved_lp), pat_ty.user_string(self.tcx)).as_slice()); } @@ -506,7 +506,7 @@ impl<'a> BorrowckCtxt<'a> { expr_span, format!("`{}` moved into closure environment here because it \ has type `{}`, which is {}", - self.loan_path_to_str(moved_lp), + self.loan_path_to_string(moved_lp), expr_ty.user_string(self.tcx), suggestion).as_slice()); } @@ -536,7 +536,7 @@ impl<'a> BorrowckCtxt<'a> { self.tcx.sess.span_err( span, format!("re-assignment of immutable variable `{}`", - self.loan_path_to_str(lp)).as_slice()); + self.loan_path_to_string(lp)).as_slice()); self.tcx.sess.span_note(assign.span, "prior assignment occurs here"); } @@ -552,20 +552,20 @@ impl<'a> BorrowckCtxt<'a> { self.tcx.sess.span_end_note(s, m); } - pub fn bckerr_to_str(&self, err: &BckError) -> String { + pub fn bckerr_to_string(&self, err: &BckError) -> String { match err.code { err_mutbl => { let descr = match opt_loan_path(&err.cmt) { None => { format!("{} {}", err.cmt.mutbl.to_user_str(), - self.cmt_to_str(&*err.cmt)) + self.cmt_to_string(&*err.cmt)) } Some(lp) => { format!("{} {} `{}`", err.cmt.mutbl.to_user_str(), - self.cmt_to_str(&*err.cmt), - self.loan_path_to_str(&*lp)) + self.cmt_to_string(&*err.cmt), + self.loan_path_to_string(&*lp)) } }; @@ -589,7 +589,7 @@ impl<'a> BorrowckCtxt<'a> { let msg = match opt_loan_path(&err.cmt) { None => "borrowed value".to_string(), Some(lp) => { - format!("`{}`", self.loan_path_to_str(&*lp)) + format!("`{}`", self.loan_path_to_string(&*lp)) } }; format!("{} does not live long enough", msg) @@ -597,9 +597,9 @@ impl<'a> BorrowckCtxt<'a> { err_borrowed_pointer_too_short(..) => { let descr = match opt_loan_path(&err.cmt) { Some(lp) => { - format!("`{}`", self.loan_path_to_str(&*lp)) + format!("`{}`", self.loan_path_to_string(&*lp)) } - None => self.cmt_to_str(&*err.cmt), + None => self.cmt_to_string(&*err.cmt), }; format!("lifetime of {} is too short to guarantee \ @@ -691,9 +691,9 @@ impl<'a> BorrowckCtxt<'a> { err_borrowed_pointer_too_short(loan_scope, ptr_scope) => { let descr = match opt_loan_path(&err.cmt) { Some(lp) => { - format!("`{}`", self.loan_path_to_str(&*lp)) + format!("`{}`", self.loan_path_to_string(&*lp)) } - None => self.cmt_to_str(&*err.cmt), + None => self.cmt_to_string(&*err.cmt), }; note_and_explain_region( self.tcx, @@ -710,7 +710,7 @@ impl<'a> BorrowckCtxt<'a> { } } - pub fn append_loan_path_to_str(&self, + pub fn append_loan_path_to_string(&self, loan_path: &LoanPath, out: &mut String) { match *loan_path { @@ -720,7 +720,7 @@ impl<'a> BorrowckCtxt<'a> { } LpExtend(ref lp_base, _, LpInterior(mc::InteriorField(fname))) => { - self.append_autoderefd_loan_path_to_str(&**lp_base, out); + self.append_autoderefd_loan_path_to_string(&**lp_base, out); match fname { mc::NamedField(fname) => { out.push_char('.'); @@ -728,24 +728,24 @@ impl<'a> BorrowckCtxt<'a> { } mc::PositionalField(idx) => { out.push_char('#'); // invent a notation here - out.push_str(idx.to_str().as_slice()); + out.push_str(idx.to_string().as_slice()); } } } LpExtend(ref lp_base, _, LpInterior(mc::InteriorElement(_))) => { - self.append_autoderefd_loan_path_to_str(&**lp_base, out); + self.append_autoderefd_loan_path_to_string(&**lp_base, out); out.push_str("[..]"); } LpExtend(ref lp_base, _, LpDeref(_)) => { out.push_char('*'); - self.append_loan_path_to_str(&**lp_base, out); + self.append_loan_path_to_string(&**lp_base, out); } } } - pub fn append_autoderefd_loan_path_to_str(&self, + pub fn append_autoderefd_loan_path_to_string(&self, loan_path: &LoanPath, out: &mut String) { match *loan_path { @@ -753,23 +753,23 @@ impl<'a> BorrowckCtxt<'a> { // For a path like `(*x).f` or `(*x)[3]`, autoderef // rules would normally allow users to omit the `*x`. // So just serialize such paths to `x.f` or x[3]` respectively. - self.append_autoderefd_loan_path_to_str(&**lp_base, out) + self.append_autoderefd_loan_path_to_string(&**lp_base, out) } LpVar(..) | LpUpvar(..) | LpExtend(_, _, LpInterior(..)) => { - self.append_loan_path_to_str(loan_path, out) + self.append_loan_path_to_string(loan_path, out) } } } - pub fn loan_path_to_str(&self, loan_path: &LoanPath) -> String { + pub fn loan_path_to_string(&self, loan_path: &LoanPath) -> String { let mut result = String::new(); - self.append_loan_path_to_str(loan_path, &mut result); + self.append_loan_path_to_string(loan_path, &mut result); result } - pub fn cmt_to_str(&self, cmt: &mc::cmt_) -> String { - self.mc().cmt_to_str(cmt) + pub fn cmt_to_string(&self, cmt: &mc::cmt_) -> String { + self.mc().cmt_to_string(cmt) } } @@ -815,11 +815,11 @@ impl Repr for LoanPath { fn repr(&self, tcx: &ty::ctxt) -> String { match self { &LpVar(id) => { - (format!("$({})", tcx.map.node_to_str(id))).to_string() + (format!("$({})", tcx.map.node_to_string(id))).to_string() } &LpUpvar(ty::UpvarId{ var_id, closure_expr_id }) => { - let s = tcx.map.node_to_str(var_id); + let s = tcx.map.node_to_string(var_id); let s = format!("$({} captured by id={})", s, closure_expr_id); s.to_string() } diff --git a/src/librustc/middle/cfg/graphviz.rs b/src/librustc/middle/cfg/graphviz.rs index c33580d869b15..9f44f0babc72a 100644 --- a/src/librustc/middle/cfg/graphviz.rs +++ b/src/librustc/middle/cfg/graphviz.rs @@ -64,7 +64,7 @@ impl<'a> dot::Labeller<'a, Node<'a>, Edge<'a>> for LabelledCFG<'a> { } else if n.data.id == ast::DUMMY_NODE_ID { dot::LabelStr("(dummy_node)".into_maybe_owned()) } else { - let s = self.ast_map.node_to_str(n.data.id); + let s = self.ast_map.node_to_string(n.data.id); // left-aligns the lines let s = replace_newline_with_backslash_l(s); dot::EscStr(s.into_maybe_owned()) @@ -80,7 +80,7 @@ impl<'a> dot::Labeller<'a, Node<'a>, Edge<'a>> for LabelledCFG<'a> { } else { put_one = true; } - let s = self.ast_map.node_to_str(node_id); + let s = self.ast_map.node_to_string(node_id); // left-aligns the lines let s = replace_newline_with_backslash_l(s); label = label.append(format!("exiting scope_{} {}", diff --git a/src/librustc/middle/check_const.rs b/src/librustc/middle/check_const.rs index cf886702d8631..33bf6ceed4f2b 100644 --- a/src/librustc/middle/check_const.rs +++ b/src/librustc/middle/check_const.rs @@ -108,7 +108,7 @@ fn check_expr(v: &mut CheckCrateVisitor, e: &Expr, is_const: bool) { .span_err(e.span, format!("can not cast to `{}` in a constant \ expression", - ppaux::ty_to_str(v.tcx, ety)).as_slice()) + ppaux::ty_to_string(v.tcx, ety)).as_slice()) } } ExprPath(ref pth) => { diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs index 6d8b178ba0014..09b2db2ecd588 100644 --- a/src/librustc/middle/check_match.rs +++ b/src/librustc/middle/check_match.rs @@ -111,7 +111,7 @@ fn check_expr(cx: &mut MatchCheckCtxt, ex: &Expr) { // We know the type is inhabited, so this must be wrong cx.tcx.sess.span_err(ex.span, format!("non-exhaustive patterns: \ type {} is non-empty", - ty_to_str(cx.tcx, pat_ty)).as_slice()); + ty_to_string(cx.tcx, pat_ty)).as_slice()); } // If the type *is* empty, it's vacuously exhaustive return; @@ -185,7 +185,7 @@ fn check_exhaustive(cx: &MatchCheckCtxt, sp: Span, m: &Matrix) { [] => wild(), _ => unreachable!() }; - let msg = format!("non-exhaustive patterns: `{0}` not covered", pat_to_str(&*witness)); + let msg = format!("non-exhaustive patterns: `{0}` not covered", pat_to_string(&*witness)); cx.tcx.sess.span_err(sp, msg.as_slice()); } } @@ -698,7 +698,7 @@ fn check_local(cx: &mut MatchCheckCtxt, loc: &Local) { Some(pat) => { let msg = format!( "refutable pattern in {} binding: `{}` not covered", - name, pat_to_str(&*pat) + name, pat_to_string(&*pat) ); cx.tcx.sess.span_err(loc.pat.span, msg.as_slice()); }, @@ -720,7 +720,7 @@ fn check_fn(cx: &mut MatchCheckCtxt, Some(pat) => { let msg = format!( "refutable pattern in function argument: `{}` not covered", - pat_to_str(&*pat) + pat_to_string(&*pat) ); cx.tcx.sess.span_err(input.pat.span, msg.as_slice()); }, diff --git a/src/librustc/middle/check_static.rs b/src/librustc/middle/check_static.rs index 33949ee5b1644..1e948afb7018f 100644 --- a/src/librustc/middle/check_static.rs +++ b/src/librustc/middle/check_static.rs @@ -75,7 +75,7 @@ impl<'a> CheckStaticVisitor<'a> { impl<'a> Visitor for CheckStaticVisitor<'a> { fn visit_item(&mut self, i: &ast::Item, _is_const: bool) { - debug!("visit_item(item={})", pprust::item_to_str(i)); + debug!("visit_item(item={})", pprust::item_to_string(i)); match i.node { ast::ItemStatic(_, mutability, ref expr) => { match mutability { @@ -99,7 +99,7 @@ impl<'a> Visitor for CheckStaticVisitor<'a> { /// of a static item, this method does nothing but walking /// down through it. fn visit_expr(&mut self, e: &ast::Expr, is_const: bool) { - debug!("visit_expr(expr={})", pprust::expr_to_str(e)); + debug!("visit_expr(expr={})", pprust::expr_to_string(e)); if !is_const { return visit::walk_expr(self, e, is_const); diff --git a/src/librustc/middle/dataflow.rs b/src/librustc/middle/dataflow.rs index 7a26d2104826f..53c3270029f3a 100644 --- a/src/librustc/middle/dataflow.rs +++ b/src/librustc/middle/dataflow.rs @@ -164,18 +164,18 @@ impl<'a, O:DataFlowOperator> pprust::PpAnn for DataFlowContext<'a, O> { let cfgidx = to_cfgidx_or_die(id, &self.nodeid_to_index); let (start, end) = self.compute_id_range_frozen(cfgidx); let on_entry = self.on_entry.slice(start, end); - let entry_str = bits_to_str(on_entry); + let entry_str = bits_to_string(on_entry); let gens = self.gens.slice(start, end); let gens_str = if gens.iter().any(|&u| u != 0) { - format!(" gen: {}", bits_to_str(gens)) + format!(" gen: {}", bits_to_string(gens)) } else { "".to_string() }; let kills = self.kills.slice(start, end); let kills_str = if kills.iter().any(|&u| u != 0) { - format!(" kill: {}", bits_to_str(kills)) + format!(" kill: {}", bits_to_string(kills)) } else { "".to_string() }; @@ -289,7 +289,7 @@ impl<'a, O:DataFlowOperator> DataFlowContext<'a, O> { fn apply_gen_kill(&mut self, cfgidx: CFGIndex, bits: &mut [uint]) { //! Applies the gen and kill sets for `id` to `bits` debug!("{:s} apply_gen_kill(cfgidx={}, bits={}) [before]", - self.analysis_name, cfgidx, mut_bits_to_str(bits)); + self.analysis_name, cfgidx, mut_bits_to_string(bits)); let (start, end) = self.compute_id_range(cfgidx); let gens = self.gens.slice(start, end); bitwise(bits, gens, &Union); @@ -297,7 +297,7 @@ impl<'a, O:DataFlowOperator> DataFlowContext<'a, O> { bitwise(bits, kills, &Subtract); debug!("{:s} apply_gen_kill(cfgidx={}, bits={}) [after]", - self.analysis_name, cfgidx, mut_bits_to_str(bits)); + self.analysis_name, cfgidx, mut_bits_to_string(bits)); } fn compute_id_range_frozen(&self, cfgidx: CFGIndex) -> (uint, uint) { @@ -334,7 +334,7 @@ impl<'a, O:DataFlowOperator> DataFlowContext<'a, O> { let (start, end) = self.compute_id_range_frozen(cfgidx); let on_entry = self.on_entry.slice(start, end); debug!("{:s} each_bit_on_entry_frozen(id={:?}, on_entry={})", - self.analysis_name, id, bits_to_str(on_entry)); + self.analysis_name, id, bits_to_string(on_entry)); self.each_bit(on_entry, f) } @@ -348,7 +348,7 @@ impl<'a, O:DataFlowOperator> DataFlowContext<'a, O> { let (start, end) = self.compute_id_range_frozen(cfgidx); let gens = self.gens.slice(start, end); debug!("{:s} each_gen_bit(id={:?}, gens={})", - self.analysis_name, id, bits_to_str(gens)); + self.analysis_name, id, bits_to_string(gens)); self.each_bit(gens, f) } @@ -426,10 +426,10 @@ impl<'a, O:DataFlowOperator> DataFlowContext<'a, O> { if changed { let bits = self.kills.mut_slice(start, end); debug!("{:s} add_kills_from_flow_exits flow_exit={} bits={} [before]", - self.analysis_name, flow_exit, mut_bits_to_str(bits)); + self.analysis_name, flow_exit, mut_bits_to_string(bits)); bits.copy_from(orig_kills.as_slice()); debug!("{:s} add_kills_from_flow_exits flow_exit={} bits={} [after]", - self.analysis_name, flow_exit, mut_bits_to_str(bits)); + self.analysis_name, flow_exit, mut_bits_to_string(bits)); } true }); @@ -483,10 +483,10 @@ impl<'a, 'b, O:DataFlowOperator> PropagationContext<'a, 'b, O> { cfg: &cfg::CFG, in_out: &mut [uint]) { debug!("DataFlowContext::walk_cfg(in_out={}) {:s}", - bits_to_str(in_out), self.dfcx.analysis_name); + bits_to_string(in_out), self.dfcx.analysis_name); cfg.graph.each_node(|node_index, node| { debug!("DataFlowContext::walk_cfg idx={} id={} begin in_out={}", - node_index, node.data.id, bits_to_str(in_out)); + node_index, node.data.id, bits_to_string(in_out)); let (start, end) = self.dfcx.compute_id_range(node_index); @@ -526,7 +526,7 @@ impl<'a, 'b, O:DataFlowOperator> PropagationContext<'a, 'b, O> { let source = edge.source(); let cfgidx = edge.target(); debug!("{:s} propagate_bits_into_entry_set_for(pred_bits={}, {} to {})", - self.dfcx.analysis_name, bits_to_str(pred_bits), source, cfgidx); + self.dfcx.analysis_name, bits_to_string(pred_bits), source, cfgidx); let (start, end) = self.dfcx.compute_id_range(cfgidx); let changed = { // (scoping mutable borrow of self.dfcx.on_entry) @@ -536,17 +536,17 @@ impl<'a, 'b, O:DataFlowOperator> PropagationContext<'a, 'b, O> { if changed { debug!("{:s} changed entry set for {:?} to {}", self.dfcx.analysis_name, cfgidx, - bits_to_str(self.dfcx.on_entry.slice(start, end))); + bits_to_string(self.dfcx.on_entry.slice(start, end))); self.changed = true; } } } -fn mut_bits_to_str(words: &mut [uint]) -> String { - bits_to_str(words) +fn mut_bits_to_string(words: &mut [uint]) -> String { + bits_to_string(words) } -fn bits_to_str(words: &[uint]) -> String { +fn bits_to_string(words: &[uint]) -> String { let mut result = String::new(); let mut sep = '['; @@ -582,7 +582,7 @@ fn bitwise(out_vec: &mut [uint], fn set_bit(words: &mut [uint], bit: uint) -> bool { debug!("set_bit: words={} bit={}", - mut_bits_to_str(words), bit_str(bit)); + mut_bits_to_string(words), bit_str(bit)); let word = bit / uint::BITS; let bit_in_word = bit % uint::BITS; let bit_mask = 1 << bit_in_word; diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 2333b32999640..782a380e23a0e 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -68,7 +68,7 @@ impl<'a> EffectCheckVisitor<'a> { _ => return }; debug!("effect: checking index with base type {}", - ppaux::ty_to_str(self.tcx, base_type)); + ppaux::ty_to_string(self.tcx, base_type)); match ty::get(base_type).sty { ty::ty_uniq(ty) | ty::ty_rptr(_, ty::mt{ty, ..}) => match ty::get(ty).sty { ty::ty_str => { @@ -147,7 +147,7 @@ impl<'a> Visitor<()> for EffectCheckVisitor<'a> { let method_call = MethodCall::expr(expr.id); let base_type = self.tcx.method_map.borrow().get(&method_call).ty; debug!("effect: method call case, base type is {}", - ppaux::ty_to_str(self.tcx, base_type)); + ppaux::ty_to_string(self.tcx, base_type)); if type_is_unsafe_function(base_type) { self.require_unsafe(expr.span, "invocation of unsafe method") @@ -156,7 +156,7 @@ impl<'a> Visitor<()> for EffectCheckVisitor<'a> { ast::ExprCall(base, _) => { let base_type = ty::node_id_to_type(self.tcx, base.id); debug!("effect: call case, base type is {}", - ppaux::ty_to_str(self.tcx, base_type)); + ppaux::ty_to_string(self.tcx, base_type)); if type_is_unsafe_function(base_type) { self.require_unsafe(expr.span, "call to unsafe function") } @@ -164,7 +164,7 @@ impl<'a> Visitor<()> for EffectCheckVisitor<'a> { ast::ExprUnary(ast::UnDeref, base) => { let base_type = ty::node_id_to_type(self.tcx, base.id); debug!("effect: unary case, base type is {}", - ppaux::ty_to_str(self.tcx, base_type)); + ppaux::ty_to_string(self.tcx, base_type)); match ty::get(base_type).sty { ty::ty_ptr(_) => { self.require_unsafe(expr.span, diff --git a/src/librustc/middle/kind.rs b/src/librustc/middle/kind.rs index 970ae36238bd6..e4e8dcaecac31 100644 --- a/src/librustc/middle/kind.rs +++ b/src/librustc/middle/kind.rs @@ -125,7 +125,7 @@ fn check_impl_of_trait(cx: &mut Context, it: &Item, trait_ref: &TraitRef, self_t cx.tcx.sess.span_err(self_type.span, format!("the type `{}', which does not fulfill `{}`, cannot implement this \ trait", - ty_to_str(cx.tcx, self_ty), + ty_to_string(cx.tcx, self_ty), missing.user_string(cx.tcx)).as_slice()); cx.tcx.sess.span_note(self_type.span, format!("types implementing this trait must fulfill `{}`", @@ -239,7 +239,7 @@ fn check_fn( } pub fn check_expr(cx: &mut Context, e: &Expr) { - debug!("kind::check_expr({})", expr_to_str(e)); + debug!("kind::check_expr({})", expr_to_string(e)); // Handle any kind bounds on type parameters check_bounds_on_type_parameters(cx, e); @@ -422,7 +422,7 @@ pub fn check_typaram_bounds(cx: &Context, sp, format!("instantiating a type parameter with an incompatible type \ `{}`, which does not fulfill `{}`", - ty_to_str(cx.tcx, ty), + ty_to_string(cx.tcx, ty), missing.user_string(cx.tcx)).as_slice()); }); } @@ -439,14 +439,14 @@ pub fn check_freevar_bounds(cx: &Context, sp: Span, ty: ty::t, format!("cannot implicitly borrow variable of type `{}` in a \ bounded stack closure (implicit reference does not \ fulfill `{}`)", - ty_to_str(cx.tcx, rty), + ty_to_string(cx.tcx, rty), missing.user_string(cx.tcx)).as_slice()) } None => { cx.tcx.sess.span_err(sp, format!("cannot capture variable of type `{}`, which does \ not fulfill `{}`, in a bounded closure", - ty_to_str(cx.tcx, ty), + ty_to_string(cx.tcx, ty), missing.user_string(cx.tcx)).as_slice()) } } @@ -463,20 +463,20 @@ pub fn check_trait_cast_bounds(cx: &Context, sp: Span, ty: ty::t, cx.tcx.sess.span_err(sp, format!("cannot pack type `{}`, which does not fulfill \ `{}`, as a trait bounded by {}", - ty_to_str(cx.tcx, ty), missing.user_string(cx.tcx), + ty_to_string(cx.tcx, ty), missing.user_string(cx.tcx), bounds.user_string(cx.tcx)).as_slice()); }); } fn check_copy(cx: &Context, ty: ty::t, sp: Span, reason: &str) { debug!("type_contents({})={}", - ty_to_str(cx.tcx, ty), - ty::type_contents(cx.tcx, ty).to_str()); + ty_to_string(cx.tcx, ty), + ty::type_contents(cx.tcx, ty).to_string()); if ty::type_moves_by_default(cx.tcx, ty) { cx.tcx.sess.span_err( sp, format!("copying a value of non-copyable type `{}`", - ty_to_str(cx.tcx, ty)).as_slice()); + ty_to_string(cx.tcx, ty)).as_slice()); cx.tcx.sess.span_note(sp, format!("{}", reason).as_slice()); } } @@ -488,7 +488,7 @@ pub fn check_static(tcx: &ty::ctxt, ty: ty::t, sp: Span) -> bool { tcx.sess.span_err(sp, format!("value may contain references; \ add `'static` bound to `{}`", - ty_to_str(tcx, ty)).as_slice()); + ty_to_string(tcx, ty)).as_slice()); } _ => { tcx.sess.span_err(sp, "value may contain references"); @@ -573,7 +573,7 @@ pub fn check_cast_for_escaping_regions( // source_span, // format!("source contains reference with lifetime \ // not found in the target type `{}`", - // ty_to_str(cx.tcx, target_ty))); + // ty_to_string(cx.tcx, target_ty))); // note_and_explain_region( // cx.tcx, "source data is only valid for ", r, ""); // } @@ -613,7 +613,7 @@ fn check_sized(tcx: &ty::ctxt, ty: ty::t, name: String, sp: Span) { format!("variable `{}` has dynamically sized type \ `{}`", name, - ty_to_str(tcx, ty)).as_slice()); + ty_to_string(tcx, ty)).as_slice()); } } @@ -621,7 +621,7 @@ fn check_sized(tcx: &ty::ctxt, ty: ty::t, name: String, sp: Span) { fn check_pat(cx: &mut Context, pat: &Pat) { let var_name = match pat.node { PatWild => Some("_".to_string()), - PatIdent(_, ref path, _) => Some(path_to_str(path).to_string()), + PatIdent(_, ref path, _) => Some(path_to_string(path).to_string()), _ => None }; @@ -632,7 +632,7 @@ fn check_pat(cx: &mut Context, pat: &Pat) { match ty { Some(ty) => { debug!("kind: checking sized-ness of variable {}: {}", - name, ty_to_str(cx.tcx, *ty)); + name, ty_to_string(cx.tcx, *ty)); check_sized(cx.tcx, *ty, name, pat.span); } None => {} // extern fn args diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index c2a19bb43c833..8b122ef3fa9a4 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -58,7 +58,7 @@ use std::i64; use std::i8; use std::rc::Rc; use std::gc::Gc; -use std::to_str::ToStr; +use std::to_str::ToString; use std::u16; use std::u32; use std::u64; @@ -126,7 +126,7 @@ pub enum Lint { RawPointerDeriving, } -pub fn level_to_str(lv: Level) -> &'static str { +pub fn level_to_string(lv: Level) -> &'static str { match lv { Allow => "allow", Warn => "warn", @@ -487,7 +487,7 @@ pub fn emit_lint(level: Level, src: LintSource, msg: &str, span: Span, let msg = match src { Default => { format!("{}, #[{}({})] on by default", msg, - level_to_str(level), lint_str) + level_to_string(level), lint_str) }, CommandLine => { format!("{} [-{} {}]", msg, @@ -498,7 +498,7 @@ pub fn emit_lint(level: Level, src: LintSource, msg: &str, span: Span, }, Node(src) => { note = Some(src); - msg.to_str() + msg.to_string() } }; @@ -513,7 +513,7 @@ pub fn emit_lint(level: Level, src: LintSource, msg: &str, span: Span, } } -pub fn lint_to_str(lint: Lint) -> &'static str { +pub fn lint_to_string(lint: Lint) -> &'static str { for &(name, lspec) in lint_table.iter() { if lspec.lint == lint { return name; @@ -546,7 +546,7 @@ impl<'a> Context<'a> { } } - fn lint_to_str(&self, lint: Lint) -> &'static str { + fn lint_to_string(&self, lint: Lint) -> &'static str { for (k, v) in self.dict.iter() { if v.lint == lint { return *k; @@ -562,7 +562,7 @@ impl<'a> Context<'a> { Some(&pair) => pair, }; - emit_lint(level, src, msg, span, self.lint_to_str(lint), self.tcx); + emit_lint(level, src, msg, span, self.lint_to_string(lint), self.tcx); } /** @@ -585,7 +585,7 @@ impl<'a> Context<'a> { UnrecognizedLint, meta.span, format!("unknown `{}` attribute: `{}`", - level_to_str(level), lintname).as_slice()); + level_to_string(level), lintname).as_slice()); } Some(lint) => { let lint = lint.lint; @@ -593,7 +593,7 @@ impl<'a> Context<'a> { if now == Forbid && level != Forbid { self.tcx.sess.span_err(meta.span, format!("{}({}) overruled by outer forbid({})", - level_to_str(level), + level_to_string(level), lintname, lintname).as_slice()); } else if now != level { @@ -649,7 +649,7 @@ pub fn each_lint(sess: &session::Session, -> bool { let xs = [Allow, Warn, Deny, Forbid]; for &level in xs.iter() { - let level_name = level_to_str(level); + let level_name = level_to_string(level); for attr in attrs.iter().filter(|m| m.check_name(level_name)) { let meta = attr.node.value; let metas = match meta.node { @@ -682,7 +682,7 @@ pub fn contains_lint(attrs: &[ast::Attribute], level: Level, lintname: &'static str) -> bool { - let level_name = level_to_str(level); + let level_name = level_to_string(level); for attr in attrs.iter().filter(|m| m.name().equiv(&level_name)) { if attr.meta_item_list().is_none() { continue @@ -995,13 +995,13 @@ fn check_heap_type(cx: &Context, span: Span, ty: ty::t) { }); if n_uniq > 0 && lint != ManagedHeapMemory { - let s = ty_to_str(cx.tcx, ty); + let s = ty_to_string(cx.tcx, ty); let m = format!("type uses owned (Box type) pointers: {}", s); cx.span_lint(lint, span, m.as_slice()); } if n_box > 0 && lint != OwnedHeapMemory { - let s = ty_to_str(cx.tcx, ty); + let s = ty_to_string(cx.tcx, ty); let m = format!("type uses managed (@ type) pointers: {}", s); cx.span_lint(lint, span, m.as_slice()); } @@ -1979,7 +1979,7 @@ pub fn check_crate(tcx: &ty::ctxt, for (id, v) in tcx.sess.lints.borrow().iter() { for &(lint, span, ref msg) in v.iter() { tcx.sess.span_bug(span, format!("unprocessed lint {} at {}: {}", - lint, tcx.map.node_to_str(*id), *msg).as_slice()) + lint, tcx.map.node_to_string(*id), *msg).as_slice()) } } diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs index 8cd840582ba99..45194e269274a 100644 --- a/src/librustc/middle/liveness.rs +++ b/src/librustc/middle/liveness.rs @@ -152,17 +152,17 @@ enum LiveNodeKind { ExitNode } -fn live_node_kind_to_str(lnk: LiveNodeKind, cx: &ty::ctxt) -> String { +fn live_node_kind_to_string(lnk: LiveNodeKind, cx: &ty::ctxt) -> String { let cm = cx.sess.codemap(); match lnk { FreeVarNode(s) => { - format!("Free var node [{}]", cm.span_to_str(s)) + format!("Free var node [{}]", cm.span_to_string(s)) } ExprNode(s) => { - format!("Expr node [{}]", cm.span_to_str(s)) + format!("Expr node [{}]", cm.span_to_string(s)) } VarDefNode(s) => { - format!("Var def node [{}]", cm.span_to_str(s)) + format!("Var def node [{}]", cm.span_to_string(s)) } ExitNode => "Exit node".to_string(), } @@ -272,8 +272,8 @@ impl<'a> IrMaps<'a> { self.lnks.push(lnk); self.num_live_nodes += 1; - debug!("{} is of kind {}", ln.to_str(), - live_node_kind_to_str(lnk, self.tcx)); + debug!("{} is of kind {}", ln.to_string(), + live_node_kind_to_string(lnk, self.tcx)); ln } @@ -282,7 +282,7 @@ impl<'a> IrMaps<'a> { let ln = self.add_live_node(lnk); self.live_node_map.insert(node_id, ln); - debug!("{} is node {}", ln.to_str(), node_id); + debug!("{} is node {}", ln.to_string(), node_id); } fn add_variable(&mut self, vk: VarKind) -> Variable { @@ -297,7 +297,7 @@ impl<'a> IrMaps<'a> { ImplicitRet => {} } - debug!("{} is {:?}", v.to_str(), vk); + debug!("{} is {:?}", v.to_string(), vk); v } @@ -317,7 +317,7 @@ impl<'a> IrMaps<'a> { fn variable_name(&self, var: Variable) -> String { match self.var_kinds.get(var.get()) { &Local(LocalInfo { ident: nm, .. }) | &Arg(_, nm) => { - token::get_ident(nm).get().to_str() + token::get_ident(nm).get().to_string() }, &ImplicitRet => "".to_string() } @@ -674,7 +674,7 @@ impl<'a> Liveness<'a> { for var_idx in range(0u, self.ir.num_vars) { let idx = node_base_idx + var_idx; if test(idx).is_valid() { - try!(write!(wr, " {}", Variable(var_idx).to_str())); + try!(write!(wr, " {}", Variable(var_idx).to_string())); } } Ok(()) @@ -716,7 +716,7 @@ impl<'a> Liveness<'a> { self.write_vars(wr, ln, |idx| self.users.get(idx).reader); write!(wr, " writes"); self.write_vars(wr, ln, |idx| self.users.get(idx).writer); - write!(wr, " precedes {}]", self.successors.get(ln.get()).to_str()); + write!(wr, " precedes {}]", self.successors.get(ln.get()).to_string()); } str::from_utf8(wr.unwrap().as_slice()).unwrap().to_string() } @@ -765,7 +765,7 @@ impl<'a> Liveness<'a> { }); debug!("merge_from_succ(ln={}, succ={}, first_merge={}, changed={})", - ln.to_str(), self.ln_str(succ_ln), first_merge, changed); + ln.to_string(), self.ln_str(succ_ln), first_merge, changed); return changed; fn copy_if_invalid(src: LiveNode, dst: &mut LiveNode) -> bool { @@ -786,14 +786,14 @@ impl<'a> Liveness<'a> { self.users.get_mut(idx).reader = invalid_node(); self.users.get_mut(idx).writer = invalid_node(); - debug!("{} defines {} (idx={}): {}", writer.to_str(), var.to_str(), + debug!("{} defines {} (idx={}): {}", writer.to_string(), var.to_string(), idx, self.ln_str(writer)); } // Either read, write, or both depending on the acc bitset fn acc(&mut self, ln: LiveNode, var: Variable, acc: uint) { debug!("{} accesses[{:x}] {}: {}", - ln.to_str(), acc, var.to_str(), self.ln_str(ln)); + ln.to_string(), acc, var.to_string(), self.ln_str(ln)); let idx = self.idx(ln, var); let user = self.users.get_mut(idx); @@ -821,7 +821,7 @@ impl<'a> Liveness<'a> { // effectively a return---this only occurs in `for` loops, // where the body is really a closure. - debug!("compute: using id for block, {}", block_to_str(body)); + debug!("compute: using id for block, {}", block_to_string(body)); let exit_ln = self.s.exit_ln; let entry_ln: LiveNode = @@ -836,7 +836,7 @@ impl<'a> Liveness<'a> { } body.id }, - entry_ln.to_str()); + entry_ln.to_string()); entry_ln } @@ -927,7 +927,7 @@ impl<'a> Liveness<'a> { fn propagate_through_expr(&mut self, expr: &Expr, succ: LiveNode) -> LiveNode { - debug!("propagate_through_expr: {}", expr_to_str(expr)); + debug!("propagate_through_expr: {}", expr_to_string(expr)); match expr.node { // Interesting cases with control flow or which gen/kill @@ -941,7 +941,7 @@ impl<'a> Liveness<'a> { } ExprFnBlock(_, ref blk) | ExprProc(_, ref blk) => { - debug!("{} is an ExprFnBlock or ExprProc", expr_to_str(expr)); + debug!("{} is an ExprFnBlock or ExprProc", expr_to_string(expr)); /* The next-node for a break is the successor of the entire @@ -1313,7 +1313,7 @@ impl<'a> Liveness<'a> { first_merge = false; } debug!("propagate_through_loop: using id for loop body {} {}", - expr.id, block_to_str(body)); + expr.id, block_to_string(body)); let cond_ln = self.propagate_through_opt_expr(cond, ln); let body_ln = self.with_loop_nodes(expr.id, succ, ln, |this| { diff --git a/src/librustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs index fbe4936a47aa6..78c3768c46733 100644 --- a/src/librustc/middle/mem_categorization.rs +++ b/src/librustc/middle/mem_categorization.rs @@ -218,7 +218,7 @@ pub fn deref_kind(tcx: &ty::ctxt, t: ty::t) -> deref_kind { None => { tcx.sess.bug( format!("deref_cat() invoked on non-derefable type {}", - ty_to_str(tcx, t)).as_slice()); + ty_to_string(tcx, t)).as_slice()); } } } @@ -973,7 +973,7 @@ impl<'t,TYPER:Typer> MemCategorizationContext<'t,TYPER> { // get the type of the *subpattern* and use that. debug!("cat_pattern: id={} pat={} cmt={}", - pat.id, pprust::pat_to_str(pat), + pat.id, pprust::pat_to_string(pat), cmt.repr(self.tcx())); op(self, cmt.clone(), pat); @@ -1098,7 +1098,7 @@ impl<'t,TYPER:Typer> MemCategorizationContext<'t,TYPER> { Ok(()) } - pub fn cmt_to_str(&self, cmt: &cmt_) -> String { + pub fn cmt_to_string(&self, cmt: &cmt_) -> String { match cmt.cat { cat_static_item => { "static item".to_string() @@ -1144,10 +1144,10 @@ impl<'t,TYPER:Typer> MemCategorizationContext<'t,TYPER> { "captured outer variable".to_string() } cat_discr(ref cmt, _) => { - self.cmt_to_str(&**cmt) + self.cmt_to_string(&**cmt) } cat_downcast(ref cmt) => { - self.cmt_to_str(&**cmt) + self.cmt_to_string(&**cmt) } } } @@ -1304,7 +1304,7 @@ impl Repr for InteriorKind { fn repr(&self, _tcx: &ty::ctxt) -> String { match *self { InteriorField(NamedField(fld)) => { - token::get_name(fld).get().to_str() + token::get_name(fld).get().to_string() } InteriorField(PositionalField(i)) => format!("#{:?}", i), InteriorElement(_) => "[]".to_string(), diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs index f69dc8e31d69b..28086b7391013 100644 --- a/src/librustc/middle/privacy.rs +++ b/src/librustc/middle/privacy.rs @@ -375,7 +375,7 @@ enum FieldName { impl<'a> PrivacyVisitor<'a> { // used when debugging fn nodestr(&self, id: ast::NodeId) -> String { - self.tcx.map.node_to_str(id).to_string() + self.tcx.map.node_to_string(id).to_string() } // Determines whether the given definition is public from the point of view @@ -423,7 +423,7 @@ impl<'a> PrivacyVisitor<'a> { } debug!("privacy - local {} not public all the way down", - self.tcx.map.node_to_str(did.node)); + self.tcx.map.node_to_string(did.node)); // return quickly for things in the same module if self.parents.find(&did.node) == self.parents.find(&self.curitem) { debug!("privacy - same parent, we're done here"); diff --git a/src/librustc/middle/reachable.rs b/src/librustc/middle/reachable.rs index 682dcb2b709f3..26bb0b62cb05f 100644 --- a/src/librustc/middle/reachable.rs +++ b/src/librustc/middle/reachable.rs @@ -336,7 +336,7 @@ impl<'a> ReachableContext<'a> { .bug(format!("found unexpected thingy in worklist: {}", self.tcx .map - .node_to_str(search_item)).as_slice()) + .node_to_string(search_item)).as_slice()) } } } diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs index 3b59736e292b5..df4d3b7efe432 100644 --- a/src/librustc/middle/region.rs +++ b/src/librustc/middle/region.rs @@ -821,7 +821,7 @@ fn resolve_fn(visitor: &mut RegionResolutionVisitor, body.id={}, \ cx.parent={})", id, - visitor.sess.codemap().span_to_str(sp), + visitor.sess.codemap().span_to_string(sp), body.id, cx.parent); diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 5ce63b94b2499..7e779c06e51f3 100644 --- a/src/librustc/middle/resolve.rs +++ b/src/librustc/middle/resolve.rs @@ -792,7 +792,7 @@ impl PrimitiveTypeTable { } -fn namespace_error_to_str(ns: NamespaceError) -> &'static str { +fn namespace_error_to_string(ns: NamespaceError) -> &'static str { match ns { NoError => "", ModuleError => "module", @@ -1071,14 +1071,14 @@ impl<'a> Resolver<'a> { let ns = ns.unwrap(); self.resolve_error(sp, format!("duplicate definition of {} `{}`", - namespace_error_to_str(duplicate_type), + namespace_error_to_string(duplicate_type), token::get_ident(name)).as_slice()); { let r = child.span_for_namespace(ns); for sp in r.iter() { self.session.span_note(*sp, format!("first definition of {} `{}` here", - namespace_error_to_str(duplicate_type), + namespace_error_to_string(duplicate_type), token::get_ident(name)).as_slice()); } } @@ -1499,7 +1499,7 @@ impl<'a> Resolver<'a> { false, true)); debug!("(build reduced graph for item) found extern `{}`", - self.module_to_str(&*external_module)); + self.module_to_string(&*external_module)); parent.module().external_module_children.borrow_mut() .insert(name.name, external_module.clone()); self.build_reduced_graph_for_external_crate(external_module); @@ -1853,7 +1853,7 @@ impl<'a> Resolver<'a> { /// Builds the reduced graph rooted at the given external module. fn populate_external_module(&mut self, module: Rc) { debug!("(populating external module) attempting to populate {}", - self.module_to_str(&*module)); + self.module_to_string(&*module)); let def_id = match module.def_id.get() { None => { @@ -1921,7 +1921,7 @@ impl<'a> Resolver<'a> { SingleImport(target, _) => { debug!("(building import directive) building import \ directive: {}::{}", - self.idents_to_str(module_.imports.borrow().last().unwrap() + self.idents_to_string(module_.imports.borrow().last().unwrap() .module_path.as_slice()), token::get_ident(target)); @@ -1994,7 +1994,7 @@ impl<'a> Resolver<'a> { /// submodules. fn resolve_imports_for_module_subtree(&mut self, module_: Rc) { debug!("(resolving imports for module subtree) resolving {}", - self.module_to_str(&*module_)); + self.module_to_string(&*module_)); let orig_module = replace(&mut self.current_module, module_.clone()); self.resolve_imports_for_module(module_.clone()); self.current_module = orig_module; @@ -2021,7 +2021,7 @@ impl<'a> Resolver<'a> { if module.all_imports_resolved() { debug!("(resolving imports for module) all imports resolved for \ {}", - self.module_to_str(&*module)); + self.module_to_string(&*module)); return; } @@ -2038,7 +2038,7 @@ impl<'a> Resolver<'a> { None => (import_directive.span, String::new()) }; let msg = format!("unresolved import `{}`{}", - self.import_path_to_str( + self.import_path_to_string( import_directive.module_path .as_slice(), import_directive.subclass), @@ -2054,7 +2054,7 @@ impl<'a> Resolver<'a> { } } - fn idents_to_str(&self, idents: &[Ident]) -> String { + fn idents_to_string(&self, idents: &[Ident]) -> String { let mut first = true; let mut result = String::new(); for ident in idents.iter() { @@ -2068,15 +2068,15 @@ impl<'a> Resolver<'a> { result } - fn path_idents_to_str(&self, path: &Path) -> String { + fn path_idents_to_string(&self, path: &Path) -> String { let identifiers: Vec = path.segments .iter() .map(|seg| seg.identifier) .collect(); - self.idents_to_str(identifiers.as_slice()) + self.idents_to_string(identifiers.as_slice()) } - fn import_directive_subclass_to_str(&mut self, + fn import_directive_subclass_to_string(&mut self, subclass: ImportDirectiveSubclass) -> String { match subclass { @@ -2087,16 +2087,16 @@ impl<'a> Resolver<'a> { } } - fn import_path_to_str(&mut self, + fn import_path_to_string(&mut self, idents: &[Ident], subclass: ImportDirectiveSubclass) -> String { if idents.is_empty() { - self.import_directive_subclass_to_str(subclass) + self.import_directive_subclass_to_string(subclass) } else { (format!("{}::{}", - self.idents_to_str(idents), - self.import_directive_subclass_to_str( + self.idents_to_string(idents), + self.import_directive_subclass_to_string( subclass))).to_string() } } @@ -2115,8 +2115,8 @@ impl<'a> Resolver<'a> { debug!("(resolving import for module) resolving import `{}::...` in \ `{}`", - self.idents_to_str(module_path.as_slice()), - self.module_to_str(&*module_)); + self.idents_to_string(module_path.as_slice()), + self.module_to_string(&*module_)); // First, resolve the module path for the directive, if necessary. let container = if module_path.len() == 0 { @@ -2222,9 +2222,9 @@ impl<'a> Resolver<'a> { debug!("(resolving single import) resolving `{}` = `{}::{}` from \ `{}` id {}, last private {:?}", token::get_ident(target), - self.module_to_str(&*containing_module), + self.module_to_string(&*containing_module), token::get_ident(source), - self.module_to_str(module_), + self.module_to_string(module_), directive.id, lp); @@ -2411,7 +2411,7 @@ impl<'a> Resolver<'a> { if value_result.is_unbound() && type_result.is_unbound() { let msg = format!("There is no `{}` in `{}`", token::get_ident(source), - self.module_to_str(&*containing_module)); + self.module_to_string(&*containing_module)); return Failed(Some((directive.span, msg))); } let value_used_public = value_used_reexport || value_used_public; @@ -2485,7 +2485,7 @@ impl<'a> Resolver<'a> { debug!("(resolving glob import) writing module resolution \ {:?} into `{}`", target_import_resolution.type_target.is_none(), - self.module_to_str(module_)); + self.module_to_string(module_)); if !target_import_resolution.is_public { debug!("(resolving glob import) nevermind, just kidding"); @@ -2581,9 +2581,9 @@ impl<'a> Resolver<'a> { debug!("(resolving glob import) writing resolution `{}` in `{}` \ to `{}`", - token::get_name(name).get().to_str(), - self.module_to_str(&*containing_module), - self.module_to_str(module_)); + token::get_name(name).get().to_string(), + self.module_to_string(&*containing_module), + self.module_to_string(module_)); // Merge the child item into the import resolution. if name_bindings.defined_in_public_namespace(ValueNS) { @@ -2643,7 +2643,7 @@ impl<'a> Resolver<'a> { false) { Failed(None) => { let segment_name = token::get_ident(name); - let module_name = self.module_to_str(&*search_module); + let module_name = self.module_to_string(&*search_module); let mut span = span; let msg = if "???" == module_name.as_slice() { span.hi = span.lo + Pos::from_uint(segment_name.get().len()); @@ -2651,10 +2651,10 @@ impl<'a> Resolver<'a> { match search_parent_externals(name.name, &self.current_module) { Some(module) => { - let path_str = self.idents_to_str(module_path); - let target_mod_str = self.module_to_str(&*module); + let path_str = self.idents_to_string(module_path); + let target_mod_str = self.module_to_string(&*module); let current_mod_str = - self.module_to_str(&*self.current_module); + self.module_to_string(&*self.current_module); let prefix = if target_mod_str == current_mod_str { "self::".to_string() @@ -2762,8 +2762,8 @@ impl<'a> Resolver<'a> { debug!("(resolving module path for import) processing `{}` rooted at \ `{}`", - self.idents_to_str(module_path), - self.module_to_str(&*module_)); + self.idents_to_string(module_path), + self.module_to_string(&*module_)); // Resolve the module prefix, if any. let module_prefix_result = self.resolve_module_prefix(module_.clone(), @@ -2774,7 +2774,7 @@ impl<'a> Resolver<'a> { let last_private; match module_prefix_result { Failed(None) => { - let mpath = self.idents_to_str(module_path); + let mpath = self.idents_to_string(module_path); let mpath = mpath.as_slice(); match mpath.rfind(':') { Some(idx) => { @@ -2856,7 +2856,7 @@ impl<'a> Resolver<'a> { namespace {:?} in `{}`", token::get_ident(name), namespace, - self.module_to_str(&*module_)); + self.module_to_string(&*module_)); // The current module node is handled specially. First, check for // its immediate children. @@ -3089,7 +3089,7 @@ impl<'a> Resolver<'a> { break } debug!("(resolving module prefix) resolving `super` at {}", - self.module_to_str(&*containing_module)); + self.module_to_string(&*containing_module)); match self.get_nearest_normal_module_parent(containing_module) { None => return Failed(None), Some(new_module) => { @@ -3100,7 +3100,7 @@ impl<'a> Resolver<'a> { } debug!("(resolving module prefix) finished resolving prefix at {}", - self.module_to_str(&*containing_module)); + self.module_to_string(&*containing_module)); return Success(PrefixFound(containing_module, i)); } @@ -3120,7 +3120,7 @@ impl<'a> Resolver<'a> { -> ResolveResult<(Target, bool)> { debug!("(resolving name in module) resolving `{}` in `{}`", token::get_name(name).get(), - self.module_to_str(&*module_)); + self.module_to_string(&*module_)); // First, check the direct children of the module. self.populate_module_if_necessary(&module_); @@ -3253,19 +3253,19 @@ impl<'a> Resolver<'a> { // OK. Continue. debug!("(recording exports for module subtree) recording \ exports for local module `{}`", - self.module_to_str(&*module_)); + self.module_to_string(&*module_)); } None => { // Record exports for the root module. debug!("(recording exports for module subtree) recording \ exports for root module `{}`", - self.module_to_str(&*module_)); + self.module_to_string(&*module_)); } Some(_) => { // Bail out. debug!("(recording exports for module subtree) not recording \ exports for `{}`", - self.module_to_str(&*module_)); + self.module_to_string(&*module_)); return; } } @@ -3381,7 +3381,7 @@ impl<'a> Resolver<'a> { None => { debug!("!!! (with scope) didn't find `{}` in `{}`", token::get_ident(name), - self.module_to_str(&*orig_module)); + self.module_to_string(&*orig_module)); } Some(name_bindings) => { match (*name_bindings).get_module_if_available() { @@ -3389,7 +3389,7 @@ impl<'a> Resolver<'a> { debug!("!!! (with scope) didn't find module \ for `{}` in `{}`", token::get_ident(name), - self.module_to_str(&*orig_module)); + self.module_to_string(&*orig_module)); } Some(module_) => { self.current_module = module_; @@ -3883,7 +3883,7 @@ impl<'a> Resolver<'a> { reference_type: TraitReferenceType) { match self.resolve_path(id, &trait_reference.path, TypeNS, true) { None => { - let path_str = self.path_idents_to_str(&trait_reference.path); + let path_str = self.path_idents_to_string(&trait_reference.path); let usage_str = match reference_type { TraitBoundingTypeParameter => "bound type parameter with", TraitImplementation => "implement", @@ -3927,7 +3927,7 @@ impl<'a> Resolver<'a> { .identifier), def); debug!("(resolving struct) writing resolution for `{}` (id {})", - this.path_idents_to_str(path), + this.path_idents_to_string(path), path_id); this.record_def(path_id, (def, lp)); } @@ -4231,13 +4231,13 @@ impl<'a> Resolver<'a> { // Write the result into the def map. debug!("(resolving type) writing resolution for `{}` \ (id {})", - self.path_idents_to_str(path), + self.path_idents_to_string(path), path_id); self.record_def(path_id, def); } None => { let msg = format!("use of undeclared type name `{}`", - self.path_idents_to_str(path)); + self.path_idents_to_string(path)); self.resolve_error(ty.span, msg.as_slice()); } } @@ -4376,7 +4376,7 @@ impl<'a> Resolver<'a> { format!("identifier `{}` is bound \ more than once in the same \ pattern", - path_to_str(path)).as_slice()); + path_to_string(path)).as_slice()); } // Else, not bound in the same pattern: do // nothing. @@ -4494,7 +4494,7 @@ impl<'a> Resolver<'a> { debug!("(resolving pattern) didn't find struct \ def: {:?}", result); let msg = format!("`{}` does not name a structure", - self.path_idents_to_str(path)); + self.path_idents_to_string(path)); self.resolve_error(path.span, msg.as_slice()); } } @@ -4724,7 +4724,7 @@ impl<'a> Resolver<'a> { Some((span, msg)) => (span, msg), None => { let msg = format!("Use of undeclared module `{}`", - self.idents_to_str( + self.idents_to_string( module_path_idents.as_slice())); (path.span, msg) } @@ -4800,7 +4800,7 @@ impl<'a> Resolver<'a> { Some((span, msg)) => (span, msg), None => { let msg = format!("Use of undeclared module `::{}`", - self.idents_to_str( + self.idents_to_string( module_path_idents.as_slice())); (path.span, msg) } @@ -5005,7 +5005,7 @@ impl<'a> Resolver<'a> { match get_module(self, path.span, ident_path.as_slice()) { Some(module) => match module.children.borrow().find(&name) { Some(binding) => { - let p_str = self.path_idents_to_str(&path); + let p_str = self.path_idents_to_string(&path); match binding.def_for_namespace(ValueNS) { Some(DefStaticMethod(_, provenance, _)) => { match provenance { @@ -5027,7 +5027,7 @@ impl<'a> Resolver<'a> { let method_map = self.method_map.borrow(); match self.current_trait_ref { Some((did, ref trait_ref)) => { - let path_str = self.path_idents_to_str(&trait_ref.path); + let path_str = self.path_idents_to_string(&trait_ref.path); match method_map.find(&(name, did)) { Some(&SelfStatic) => return StaticTraitMethod(path_str), @@ -5100,7 +5100,7 @@ impl<'a> Resolver<'a> { Some(def) => { // Write the result into the def map. debug!("(resolving expr) resolved `{}`", - self.path_idents_to_str(path)); + self.path_idents_to_string(path)); // First-class methods are not supported yet; error // out here. @@ -5120,7 +5120,7 @@ impl<'a> Resolver<'a> { self.record_def(expr.id, def); } None => { - let wrong_name = self.path_idents_to_str(path); + let wrong_name = self.path_idents_to_string(path); // Be helpful if the name refers to a struct // (The pattern matching def_tys where the id is in self.structs // matches on regular structs while excluding tuple- and enum-like @@ -5222,7 +5222,7 @@ impl<'a> Resolver<'a> { debug!("(resolving expression) didn't find struct \ def: {:?}", result); let msg = format!("`{}` does not name a structure", - self.path_idents_to_str(path)); + self.path_idents_to_string(path)); self.resolve_error(path.span, msg.as_slice()); } } @@ -5522,7 +5522,7 @@ impl<'a> Resolver<'a> { // /// A somewhat inefficient routine to obtain the name of a module. - fn module_to_str(&self, module: &Module) -> String { + fn module_to_string(&self, module: &Module) -> String { let mut idents = Vec::new(); fn collect_mod(idents: &mut Vec, module: &Module) { @@ -5543,14 +5543,14 @@ impl<'a> Resolver<'a> { if idents.len() == 0 { return "???".to_string(); } - self.idents_to_str(idents.move_iter().rev() + self.idents_to_string(idents.move_iter().rev() .collect::>() .as_slice()) } #[allow(dead_code)] // useful for debugging fn dump_module(&mut self, module_: Rc) { - debug!("Dump of module `{}`:", self.module_to_str(&*module_)); + debug!("Dump of module `{}`:", self.module_to_string(&*module_)); debug!("Children:"); self.populate_module_if_necessary(&module_); diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 8ff5331cec231..516b5730a3ad9 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -372,7 +372,7 @@ impl<'a> LifetimeContext<'a> { } debug!("lifetime_ref={} id={} resolved to {:?}", - lifetime_to_str(lifetime_ref), + lifetime_to_string(lifetime_ref), lifetime_ref.id, def); self.named_region_map.insert(lifetime_ref.id, def); diff --git a/src/librustc/middle/save/mod.rs b/src/librustc/middle/save/mod.rs index 2b2f3b8fb0b5f..221a7e8d51614 100644 --- a/src/librustc/middle/save/mod.rs +++ b/src/librustc/middle/save/mod.rs @@ -108,7 +108,7 @@ impl <'l> DxrVisitor<'l> { if spans.len() < path.segments.len() { error!("Mis-calculated spans for path '{}'. \ Found {} spans, expected {}. Found spans:", - path_to_str(path), spans.len(), path.segments.len()); + path_to_string(path), spans.len(), path.segments.len()); for s in spans.iter() { let loc = self.sess.codemap().lookup_char_pos(s.lo); error!(" '{}' in {}, line {}", @@ -126,7 +126,7 @@ impl <'l> DxrVisitor<'l> { let sub_path = ast::Path{span: *span, // span for the last segment global: path.global, segments: segs}; - let qualname = path_to_str(&sub_path); + let qualname = path_to_string(&sub_path); result.push((*span, qualname)); segs = sub_path.segments; } @@ -249,7 +249,7 @@ impl <'l> DxrVisitor<'l> { self.collecting = false; let span_utils = self.span; for &(id, ref p, _, _) in self.collected_paths.iter() { - let typ = ppaux::ty_to_str(&self.analysis.ty_cx, + let typ = ppaux::ty_to_string(&self.analysis.ty_cx, *self.analysis.ty_cx.node_types.borrow().get(&(id as uint))); // get the span only for the name of the variable (I hope the path is only ever a // variable name, but who knows?) @@ -257,7 +257,7 @@ impl <'l> DxrVisitor<'l> { span_utils.span_for_last_ident(p.span), id, qualname, - path_to_str(p).as_slice(), + path_to_string(p).as_slice(), typ.as_slice()); } self.collected_paths.clear(); @@ -280,7 +280,7 @@ impl <'l> DxrVisitor<'l> { match item.node { ast::ItemImpl(_, _, ty, _) => { let mut result = String::from_str("<"); - result.push_str(ty_to_str(&*ty).as_slice()); + result.push_str(ty_to_string(&*ty).as_slice()); match ty::trait_of_method(&self.analysis.ty_cx, ast_util::local_def(method.id)) { @@ -400,7 +400,7 @@ impl <'l> DxrVisitor<'l> { ast::NamedField(ident, _) => { let name = get_ident(ident); let qualname = format!("{}::{}", qualname, name); - let typ = ppaux::ty_to_str(&self.analysis.ty_cx, + let typ = ppaux::ty_to_string(&self.analysis.ty_cx, *self.analysis.ty_cx.node_types.borrow().get(&(field.node.id as uint))); match self.span.sub_span_before_token(field.span, token::COLON) { Some(sub_span) => self.fmt.field_str(field.span, @@ -452,7 +452,7 @@ impl <'l> DxrVisitor<'l> { decl: ast::P, ty_params: &ast::Generics, body: ast::P) { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); let sub_span = self.span.sub_span_after_keyword(item.span, keywords::Fn); self.fmt.fn_str(item.span, @@ -482,7 +482,7 @@ impl <'l> DxrVisitor<'l> { mt: ast::Mutability, expr: &ast::Expr) { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); // If the variable is immutable, save the initialising expresion. let value = match mt { @@ -497,7 +497,7 @@ impl <'l> DxrVisitor<'l> { get_ident(item.ident).get(), qualname.as_slice(), value.as_slice(), - ty_to_str(&*typ).as_slice(), + ty_to_string(&*typ).as_slice(), e.cur_scope); // walk type and init value @@ -510,7 +510,7 @@ impl <'l> DxrVisitor<'l> { e: DxrVisitorEnv, def: &ast::StructDef, ty_params: &ast::Generics) { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); let ctor_id = match def.ctor_id { Some(node_id) => node_id, @@ -538,7 +538,7 @@ impl <'l> DxrVisitor<'l> { e: DxrVisitorEnv, enum_definition: &ast::EnumDef, ty_params: &ast::Generics) { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); match self.span.sub_span_after_keyword(item.span, keywords::Enum) { Some(sub_span) => self.fmt.enum_str(item.span, Some(sub_span), @@ -639,7 +639,7 @@ impl <'l> DxrVisitor<'l> { generics: &ast::Generics, trait_refs: &Vec, methods: &Vec) { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); let sub_span = self.span.sub_span_after_keyword(item.span, keywords::Trait); self.fmt.trait_str(item.span, @@ -678,7 +678,7 @@ impl <'l> DxrVisitor<'l> { item: &ast::Item, // The module in question, represented as an item. e: DxrVisitorEnv, m: &ast::Mod) { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); let cm = self.sess.codemap(); let filename = cm.span_to_filename(m.inner); @@ -970,8 +970,8 @@ impl<'l> Visitor for DxrVisitor<'l> { self.process_trait(item, e, generics, trait_refs, methods), ast::ItemMod(ref m) => self.process_mod(item, e, m), ast::ItemTy(ty, ref ty_params) => { - let qualname = self.analysis.ty_cx.map.path_to_str(item.id); - let value = ty_to_str(&*ty); + let qualname = self.analysis.ty_cx.map.path_to_string(item.id); + let value = ty_to_string(&*ty); let sub_span = self.span.sub_span_after_keyword(item.span, keywords::Type); self.fmt.typedef_str(item.span, sub_span, @@ -1230,7 +1230,7 @@ impl<'l> Visitor for DxrVisitor<'l> { return } - let id = String::from_str("$").append(ex.id.to_str().as_slice()); + let id = String::from_str("$").append(ex.id.to_string().as_slice()); self.process_formals(&decl.inputs, id.as_slice(), e); // walk arg and return types @@ -1287,7 +1287,7 @@ impl<'l> Visitor for DxrVisitor<'l> { def::DefBinding(id, _) => self.fmt.variable_str(p.span, sub_span, id, - path_to_str(p).as_slice(), + path_to_string(p).as_slice(), value.as_slice(), ""), def::DefVariant(_,id,_) => self.fmt.ref_str(ref_kind, @@ -1330,7 +1330,7 @@ impl<'l> Visitor for DxrVisitor<'l> { for &(id, ref p, ref immut, _) in self.collected_paths.iter() { let value = if *immut { value.to_owned() } else { "".to_owned() }; let types = self.analysis.ty_cx.node_types.borrow(); - let typ = ppaux::ty_to_str(&self.analysis.ty_cx, *types.get(&(id as uint))); + let typ = ppaux::ty_to_string(&self.analysis.ty_cx, *types.get(&(id as uint))); // Get the span only for the name of the variable (I hope the path // is only ever a variable name, but who knows?). let sub_span = self.span.span_for_last_ident(p.span); @@ -1338,7 +1338,7 @@ impl<'l> Visitor for DxrVisitor<'l> { self.fmt.variable_str(p.span, sub_span, id, - path_to_str(p).as_slice(), + path_to_string(p).as_slice(), value.as_slice(), typ.as_slice()); } @@ -1373,7 +1373,7 @@ pub fn process_crate(sess: &Session, } let (cratename, crateid) = match attr::find_crateid(krate.attrs.as_slice()) { - Some(crateid) => (crateid.name.clone(), crateid.to_str()), + Some(crateid) => (crateid.name.clone(), crateid.to_string()), None => { info!("Could not find crate name, using 'unknown_crate'"); (String::from_str("unknown_crate"),"unknown_crate".to_owned()) diff --git a/src/librustc/middle/save/recorder.rs b/src/librustc/middle/save/recorder.rs index 428f97d0e53d5..f3e97f319e328 100644 --- a/src/librustc/middle/save/recorder.rs +++ b/src/librustc/middle/save/recorder.rs @@ -252,7 +252,7 @@ impl<'a> FmtStrs<'a> { // the local case they can be overridden in one block and there is no nice way // to refer to such a scope in english, so we just hack it by appending the // variable def's node id - let qualname = String::from_str(name).append("$").append(id.to_str().as_slice()); + let qualname = String::from_str(name).append("$").append(id.to_string().as_slice()); self.check_and_record(Variable, span, sub_span, diff --git a/src/librustc/middle/trans/_match.rs b/src/librustc/middle/trans/_match.rs index 5b9c89f625093..7373d5c65d1c2 100644 --- a/src/librustc/middle/trans/_match.rs +++ b/src/librustc/middle/trans/_match.rs @@ -432,10 +432,10 @@ fn expand_nested_bindings<'a, 'b>( val: ValueRef) -> Vec> { debug!("expand_nested_bindings(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); m.iter().map(|br| { @@ -482,10 +482,10 @@ fn enter_match<'a, 'b>( e: enter_pat) -> Vec> { debug!("enter_match(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); m.iter().filter_map(|br| { @@ -521,10 +521,10 @@ fn enter_default<'a, 'b>( val: ValueRef) -> Vec> { debug!("enter_default(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); // Collect all of the matches that can match against anything. @@ -570,11 +570,11 @@ fn enter_opt<'a, 'b>( val: ValueRef) -> Vec> { debug!("enter_opt(bcx={}, m={}, opt={:?}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), *opt, col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); let tcx = bcx.tcx(); @@ -711,10 +711,10 @@ fn enter_rec_or_struct<'a, 'b>( val: ValueRef) -> Vec> { debug!("enter_rec_or_struct(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); let dummy = box(GC) ast::Pat {id: 0, node: ast::PatWild, span: DUMMY_SP}; @@ -747,10 +747,10 @@ fn enter_tup<'a, 'b>( n_elts: uint) -> Vec> { debug!("enter_tup(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); let dummy = box(GC) ast::Pat {id: 0, node: ast::PatWild, span: DUMMY_SP}; @@ -780,10 +780,10 @@ fn enter_tuple_struct<'a, 'b>( n_elts: uint) -> Vec> { debug!("enter_tuple_struct(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); let dummy = box(GC) ast::Pat {id: 0, node: ast::PatWild, span: DUMMY_SP}; @@ -811,10 +811,10 @@ fn enter_uniq<'a, 'b>( val: ValueRef) -> Vec> { debug!("enter_uniq(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); let dummy = box(GC) ast::Pat {id: 0, node: ast::PatWild, span: DUMMY_SP}; @@ -839,10 +839,10 @@ fn enter_region<'a, 'b>( val: ValueRef) -> Vec> { debug!("enter_region(bcx={}, m={}, col={}, val={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), col, - bcx.val_to_str(val)); + bcx.val_to_string(val)); let _indenter = indenter(); let dummy = box(GC) ast::Pat { id: 0, node: ast::PatWild, span: DUMMY_SP }; @@ -1216,7 +1216,7 @@ fn compare_values<'a>( let did = langcall(cx, None, format!("comparison of `{}`", - cx.ty_to_str(rhs_t)).as_slice(), + cx.ty_to_string(rhs_t)).as_slice(), StrEqFnLangItem); let result = callee::trans_lang_call(cx, did, [lhs, rhs], None); Result { @@ -1241,7 +1241,7 @@ fn compare_values<'a>( let did = langcall(cx, None, format!("comparison of `{}`", - cx.ty_to_str(rhs_t)).as_slice(), + cx.ty_to_string(rhs_t)).as_slice(), UniqStrEqFnLangItem); let result = callee::trans_lang_call(cx, did, [scratch_lhs, scratch_rhs], None); Result { @@ -1331,7 +1331,7 @@ fn insert_lllocals<'a>(bcx: &'a Block<'a>, debug!("binding {:?} to {}", binding_info.id, - bcx.val_to_str(llval)); + bcx.val_to_string(llval)); bcx.fcx.lllocals.borrow_mut().insert(binding_info.id, datum); if bcx.sess().opts.debuginfo == FullDebugInfo { @@ -1355,10 +1355,10 @@ fn compile_guard<'a, 'b>( has_genuine_default: bool) -> &'b Block<'b> { debug!("compile_guard(bcx={}, guard_expr={}, m={}, vals={})", - bcx.to_str(), - bcx.expr_to_str(guard_expr), + bcx.to_string(), + bcx.expr_to_string(guard_expr), m.repr(bcx.tcx()), - vec_map_to_str(vals, |v| bcx.val_to_str(*v))); + vec_map_to_string(vals, |v| bcx.val_to_string(*v))); let _indenter = indenter(); // Lest the guard itself should fail, introduce a temporary cleanup @@ -1420,9 +1420,9 @@ fn compile_submatch<'a, 'b>( chk: &FailureHandler, has_genuine_default: bool) { debug!("compile_submatch(bcx={}, m={}, vals={})", - bcx.to_str(), + bcx.to_string(), m.repr(bcx.tcx()), - vec_map_to_str(vals, |v| bcx.val_to_str(*v))); + vec_map_to_string(vals, |v| bcx.val_to_string(*v))); let _indenter = indenter(); let _icx = push_ctxt("match::compile_submatch"); let mut bcx = bcx; @@ -1589,7 +1589,7 @@ fn compile_submatch_continue<'a, 'b>( debug!("options={:?}", opts); let mut kind = no_branch; let mut test_val = val; - debug!("test_val={}", bcx.val_to_str(test_val)); + debug!("test_val={}", bcx.val_to_string(test_val)); if opts.len() > 0u { match *opts.get(0) { var(_, ref repr) => { @@ -2140,7 +2140,7 @@ fn bind_irrefutable_pat<'a>( */ debug!("bind_irrefutable_pat(bcx={}, pat={}, binding_mode={:?})", - bcx.to_str(), + bcx.to_string(), pat.repr(bcx.tcx()), binding_mode); diff --git a/src/librustc/middle/trans/adt.rs b/src/librustc/middle/trans/adt.rs index e4b28dc7aa7c2..b6d520a50c37c 100644 --- a/src/librustc/middle/trans/adt.rs +++ b/src/librustc/middle/trans/adt.rs @@ -135,7 +135,7 @@ pub fn represent_node(bcx: &Block, node: ast::NodeId) -> Rc { /// Decides how to represent a given type. pub fn represent_type(cx: &CrateContext, t: ty::t) -> Rc { - debug!("Representing: {}", ty_to_str(cx.tcx(), t)); + debug!("Representing: {}", ty_to_string(cx.tcx(), t)); match cx.adt_reprs.borrow().find(&t) { Some(repr) => return repr.clone(), None => {} diff --git a/src/librustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs index 35795cc9f23ee..7338d71d6be65 100644 --- a/src/librustc/middle/trans/base.rs +++ b/src/librustc/middle/trans/base.rs @@ -302,7 +302,7 @@ fn require_alloc_fn(bcx: &Block, info_ty: ty::t, it: LangItem) -> ast::DefId { Ok(id) => id, Err(s) => { bcx.sess().fatal(format!("allocation of `{}` {}", - bcx.ty_to_str(info_ty), + bcx.ty_to_string(info_ty), s).as_slice()); } } @@ -708,7 +708,7 @@ pub fn iter_structural_ty<'r, let variant_cx = fcx.new_temp_block( format!("enum-iter-variant-{}", - variant.disr_val.to_str().as_slice()) + variant.disr_val.to_string().as_slice()) .as_slice()); match adt::trans_case(cx, &*repr, variant.disr_val) { _match::single_result(r) => { @@ -811,7 +811,7 @@ pub fn fail_if_zero_or_overflows<'a>( } _ => { cx.sess().bug(format!("fail-if-zero on unexpected type: {}", - ty_to_str(cx.tcx(), rhs_t)).as_slice()); + ty_to_string(cx.tcx(), rhs_t)).as_slice()); } }; let bcx = with_cond(cx, is_zero, |bcx| { @@ -905,7 +905,7 @@ pub fn invoke<'a>( debug!("invoke at ???"); } Some(id) => { - debug!("invoke at {}", bcx.tcx().map.node_to_str(id)); + debug!("invoke at {}", bcx.tcx().map.node_to_string(id)); } } @@ -972,7 +972,7 @@ pub fn ignore_lhs(_bcx: &Block, local: &ast::Local) -> bool { pub fn init_local<'a>(bcx: &'a Block<'a>, local: &ast::Local) -> &'a Block<'a> { - debug!("init_local(bcx={}, local.id={:?})", bcx.to_str(), local.id); + debug!("init_local(bcx={}, local.id={:?})", bcx.to_string(), local.id); let _indenter = indenter(); let _icx = push_ctxt("init_local"); _match::store_local(bcx, local) @@ -1144,7 +1144,7 @@ pub fn new_fn_ctxt<'a>(ccx: &'a CrateContext, if id == -1 { "".to_string() } else { - ccx.tcx.map.path_to_str(id).to_string() + ccx.tcx.map.path_to_string(id).to_string() }, id, param_substs.repr(ccx.tcx())); @@ -1442,7 +1442,7 @@ pub fn trans_fn(ccx: &CrateContext, param_substs: ¶m_substs, id: ast::NodeId, attrs: &[ast::Attribute]) { - let _s = StatRecorder::new(ccx, ccx.tcx.map.path_to_str(id).to_string()); + let _s = StatRecorder::new(ccx, ccx.tcx.map.path_to_string(id).to_string()); debug!("trans_fn(param_substs={})", param_substs.repr(ccx.tcx())); let _icx = push_ctxt("trans_fn"); let output_type = ty::ty_fn_ret(ty::node_id_to_type(ccx.tcx(), id)); @@ -1495,7 +1495,7 @@ fn trans_enum_variant_or_tuple_like_struct(ccx: &CrateContext, _ => ccx.sess().bug( format!("trans_enum_variant_or_tuple_like_struct: \ unexpected ctor return type {}", - ty_to_str(ccx.tcx(), ctor_ty)).as_slice()) + ty_to_string(ccx.tcx(), ctor_ty)).as_slice()) }; let arena = TypedArena::new(); @@ -1591,7 +1591,7 @@ fn enum_variant_size_lint(ccx: &CrateContext, enum_def: &ast::EnumDef, sp: Span, format!("enum variant is more than three times larger \ ({} bytes) than the next largest (ignoring padding)", largest).as_slice(), - sp, lint::lint_to_str(lint::VariantSizeDifference), ccx.tcx()); + sp, lint::lint_to_string(lint::VariantSizeDifference), ccx.tcx()); ccx.sess().span_note(enum_def.variants.get(largest_index).span, "this variant is the largest"); @@ -1967,7 +1967,7 @@ fn exported_name(ccx: &CrateContext, id: ast::NodeId, _ => ccx.tcx.map.with_path(id, |mut path| { if attr::contains_name(attrs, "no_mangle") { // Don't mangle - path.last().unwrap().to_str() + path.last().unwrap().to_string() } else { match weak_lang_items::link_name(attrs) { Some(name) => name.get().to_string(), diff --git a/src/librustc/middle/trans/build.rs b/src/librustc/middle/trans/build.rs index e04454d4a68d0..59fb1d5ce1a1b 100644 --- a/src/librustc/middle/trans/build.rs +++ b/src/librustc/middle/trans/build.rs @@ -25,7 +25,7 @@ use middle::trans::type_::Type; use libc::{c_uint, c_ulonglong, c_char}; pub fn terminate(cx: &Block, _: &str) { - debug!("terminate({})", cx.to_str()); + debug!("terminate({})", cx.to_string()); cx.terminated.set(true); } @@ -122,8 +122,8 @@ pub fn Invoke(cx: &Block, check_not_terminated(cx); terminate(cx, "Invoke"); debug!("Invoke({} with arguments ({}))", - cx.val_to_str(fn_), - args.iter().map(|a| cx.val_to_str(*a)).collect::>().connect(", ")); + cx.val_to_string(fn_), + args.iter().map(|a| cx.val_to_string(*a)).collect::>().connect(", ")); B(cx).invoke(fn_, args, then, catch, attributes) } diff --git a/src/librustc/middle/trans/builder.rs b/src/librustc/middle/trans/builder.rs index 4078268c6a5d8..ccf7532590cc0 100644 --- a/src/librustc/middle/trans/builder.rs +++ b/src/librustc/middle/trans/builder.rs @@ -489,8 +489,8 @@ impl<'a> Builder<'a> { pub fn store(&self, val: ValueRef, ptr: ValueRef) { debug!("Store {} -> {}", - self.ccx.tn.val_to_str(val), - self.ccx.tn.val_to_str(ptr)); + self.ccx.tn.val_to_string(val), + self.ccx.tn.val_to_string(ptr)); assert!(self.llbuilder.is_not_null()); self.count_insn("store"); unsafe { @@ -500,8 +500,8 @@ impl<'a> Builder<'a> { pub fn volatile_store(&self, val: ValueRef, ptr: ValueRef) { debug!("Store {} -> {}", - self.ccx.tn.val_to_str(val), - self.ccx.tn.val_to_str(ptr)); + self.ccx.tn.val_to_string(val), + self.ccx.tn.val_to_string(ptr)); assert!(self.llbuilder.is_not_null()); self.count_insn("store.volatile"); unsafe { @@ -512,8 +512,8 @@ impl<'a> Builder<'a> { pub fn atomic_store(&self, val: ValueRef, ptr: ValueRef, order: AtomicOrdering) { debug!("Store {} -> {}", - self.ccx.tn.val_to_str(val), - self.ccx.tn.val_to_str(ptr)); + self.ccx.tn.val_to_string(val), + self.ccx.tn.val_to_string(ptr)); self.count_insn("store.atomic"); unsafe { let ty = Type::from_ref(llvm::LLVMTypeOf(ptr)); @@ -752,7 +752,7 @@ impl<'a> Builder<'a> { if self.ccx.sess().asm_comments() { let s = format!("{} ({})", text, - self.ccx.sess().codemap().span_to_str(sp)); + self.ccx.sess().codemap().span_to_string(sp)); debug!("{}", s.as_slice()); self.add_comment(s.as_slice()); } @@ -786,11 +786,11 @@ impl<'a> Builder<'a> { else { lib::llvm::False }; let argtys = inputs.iter().map(|v| { - debug!("Asm Input Type: {:?}", self.ccx.tn.val_to_str(*v)); + debug!("Asm Input Type: {:?}", self.ccx.tn.val_to_string(*v)); val_ty(*v) }).collect::>(); - debug!("Asm Output Type: {:?}", self.ccx.tn.type_to_str(output)); + debug!("Asm Output Type: {:?}", self.ccx.tn.type_to_string(output)); let fty = Type::func(argtys.as_slice(), &output); unsafe { let v = llvm::LLVMInlineAsm( @@ -804,9 +804,9 @@ impl<'a> Builder<'a> { self.count_insn("call"); debug!("Call {} with args ({})", - self.ccx.tn.val_to_str(llfn), + self.ccx.tn.val_to_string(llfn), args.iter() - .map(|&v| self.ccx.tn.val_to_str(v)) + .map(|&v| self.ccx.tn.val_to_string(v)) .collect::>() .connect(", ")); diff --git a/src/librustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs index 8b484e90898c9..e181df75d39d7 100644 --- a/src/librustc/middle/trans/callee.rs +++ b/src/librustc/middle/trans/callee.rs @@ -108,7 +108,7 @@ fn trans<'a>(bcx: &'a Block<'a>, expr: &ast::Expr) -> Callee<'a> { expr.span, format!("type of callee is neither bare-fn nor closure: \ {}", - bcx.ty_to_str(datum.ty)).as_slice()); + bcx.ty_to_string(datum.ty)).as_slice()); } } } @@ -254,7 +254,7 @@ pub fn trans_fn_ref_with_vtables( debug!("trans_fn_ref_with_vtables(bcx={}, def_id={}, node={:?}, \ substs={}, vtables={})", - bcx.to_str(), + bcx.to_string(), def_id.repr(tcx), node, substs.repr(tcx), @@ -780,7 +780,7 @@ pub fn trans_arg_datum<'a>( let arg_datum_ty = arg_datum.ty; - debug!(" arg datum: {}", arg_datum.to_str(bcx.ccx())); + debug!(" arg datum: {}", arg_datum.to_string(bcx.ccx())); let mut val; if ty::type_is_bot(arg_datum_ty) { @@ -824,11 +824,11 @@ pub fn trans_arg_datum<'a>( // this could happen due to e.g. subtyping let llformal_arg_ty = type_of::type_of_explicit_arg(ccx, formal_arg_ty); debug!("casting actual type ({}) to match formal ({})", - bcx.val_to_str(val), bcx.llty_str(llformal_arg_ty)); + bcx.val_to_string(val), bcx.llty_str(llformal_arg_ty)); val = PointerCast(bcx, val, llformal_arg_ty); } } - debug!("--- trans_arg_datum passing {}", bcx.val_to_str(val)); + debug!("--- trans_arg_datum passing {}", bcx.val_to_string(val)); Result::new(bcx, val) } diff --git a/src/librustc/middle/trans/cleanup.rs b/src/librustc/middle/trans/cleanup.rs index 24f30bae75a91..f7143ec395400 100644 --- a/src/librustc/middle/trans/cleanup.rs +++ b/src/librustc/middle/trans/cleanup.rs @@ -85,7 +85,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { */ debug!("push_ast_cleanup_scope({})", - self.ccx.tcx.map.node_to_str(id)); + self.ccx.tcx.map.node_to_string(id)); // FIXME(#2202) -- currently closure bodies have a parent // region, which messes up the assertion below, since there @@ -109,7 +109,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { id: ast::NodeId, exits: [&'a Block<'a>, ..EXIT_MAX]) { debug!("push_loop_cleanup_scope({})", - self.ccx.tcx.map.node_to_str(id)); + self.ccx.tcx.map.node_to_string(id)); assert_eq!(Some(id), self.top_ast_scope()); self.push_scope(CleanupScope::new(LoopScopeKind(id, exits))); @@ -133,7 +133,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { */ debug!("pop_and_trans_ast_cleanup_scope({})", - self.ccx.tcx.map.node_to_str(cleanup_scope)); + self.ccx.tcx.map.node_to_string(cleanup_scope)); assert!(self.top_scope(|s| s.kind.is_ast_with_id(cleanup_scope))); @@ -152,7 +152,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { */ debug!("pop_loop_cleanup_scope({})", - self.ccx.tcx.map.node_to_str(cleanup_scope)); + self.ccx.tcx.map.node_to_string(cleanup_scope)); assert!(self.top_scope(|s| s.kind.is_loop_with_id(cleanup_scope))); @@ -245,7 +245,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { debug!("schedule_drop_mem({:?}, val={}, ty={})", cleanup_scope, - self.ccx.tn.val_to_str(val), + self.ccx.tn.val_to_string(val), ty.repr(self.ccx.tcx())); self.schedule_clean(cleanup_scope, drop as Box); @@ -269,7 +269,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { debug!("schedule_drop_immediate({:?}, val={}, ty={})", cleanup_scope, - self.ccx.tn.val_to_str(val), + self.ccx.tn.val_to_string(val), ty.repr(self.ccx.tcx())); self.schedule_clean(cleanup_scope, drop as Box); @@ -289,7 +289,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { debug!("schedule_free_value({:?}, val={}, heap={:?})", cleanup_scope, - self.ccx.tn.val_to_str(val), + self.ccx.tn.val_to_string(val), heap); self.schedule_clean(cleanup_scope, drop as Box); @@ -329,7 +329,7 @@ impl<'a> CleanupMethods<'a> for FunctionContext<'a> { self.ccx.sess().bug( format!("no cleanup scope {} found", - self.ccx.tcx.map.node_to_str(cleanup_scope)).as_slice()); + self.ccx.tcx.map.node_to_string(cleanup_scope)).as_slice()); } fn schedule_clean_in_custom_scope(&self, diff --git a/src/librustc/middle/trans/closure.rs b/src/librustc/middle/trans/closure.rs index f956b58031cde..c7e6e841ce882 100644 --- a/src/librustc/middle/trans/closure.rs +++ b/src/librustc/middle/trans/closure.rs @@ -104,8 +104,8 @@ pub struct EnvValue { } impl EnvValue { - pub fn to_str(&self, ccx: &CrateContext) -> String { - format!("{}({})", self.action, self.datum.to_str(ccx)) + pub fn to_string(&self, ccx: &CrateContext) -> String { + format!("{}({})", self.action, self.datum.to_string(ccx)) } } @@ -124,7 +124,7 @@ pub fn mk_closure_tys(tcx: &ty::ctxt, } }).collect(); let cdata_ty = ty::mk_tup(tcx, bound_tys); - debug!("cdata_ty={}", ty_to_str(tcx, cdata_ty)); + debug!("cdata_ty={}", ty_to_string(tcx, cdata_ty)); return cdata_ty; } @@ -196,16 +196,16 @@ pub fn store_environment<'a>( let Result {bcx: bcx, val: llbox} = allocate_cbox(bcx, store, cdata_ty); let llbox = PointerCast(bcx, llbox, llboxptr_ty); - debug!("tuplify_box_ty = {}", ty_to_str(tcx, cbox_ty)); + debug!("tuplify_box_ty = {}", ty_to_string(tcx, cbox_ty)); // Copy expr values into boxed bindings. let mut bcx = bcx; for (i, bv) in bound_values.move_iter().enumerate() { - debug!("Copy {} into closure", bv.to_str(ccx)); + debug!("Copy {} into closure", bv.to_string(ccx)); if ccx.sess().asm_comments() { add_comment(bcx, format!("Copy {} into closure", - bv.to_str(ccx)).as_slice()); + bv.to_string(ccx)).as_slice()); } let bound_data = GEPi(bcx, llbox, [0u, abi::box_field_body, i]); diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs index d7509866e0886..e2f06dcfaccb6 100644 --- a/src/librustc/middle/trans/common.rs +++ b/src/librustc/middle/trans/common.rs @@ -196,13 +196,13 @@ impl param_substs { } } -fn param_substs_to_str(this: ¶m_substs, tcx: &ty::ctxt) -> String { +fn param_substs_to_string(this: ¶m_substs, tcx: &ty::ctxt) -> String { format!("param_substs({})", this.substs.repr(tcx)) } impl Repr for param_substs { fn repr(&self, tcx: &ty::ctxt) -> String { - param_substs_to_str(self, tcx) + param_substs_to_string(self, tcx) } } @@ -440,11 +440,11 @@ impl<'a> Block<'a> { token::get_ident(ident).get().to_string() } - pub fn node_id_to_str(&self, id: ast::NodeId) -> String { - self.tcx().map.node_to_str(id).to_string() + pub fn node_id_to_string(&self, id: ast::NodeId) -> String { + self.tcx().map.node_to_string(id).to_string() } - pub fn expr_to_str(&self, e: &ast::Expr) -> String { + pub fn expr_to_string(&self, e: &ast::Expr) -> String { e.repr(self.tcx()) } @@ -458,19 +458,19 @@ impl<'a> Block<'a> { } } - pub fn val_to_str(&self, val: ValueRef) -> String { - self.ccx().tn.val_to_str(val) + pub fn val_to_string(&self, val: ValueRef) -> String { + self.ccx().tn.val_to_string(val) } pub fn llty_str(&self, ty: Type) -> String { - self.ccx().tn.type_to_str(ty) + self.ccx().tn.type_to_string(ty) } - pub fn ty_to_str(&self, t: ty::t) -> String { + pub fn ty_to_string(&self, t: ty::t) -> String { t.repr(self.tcx()) } - pub fn to_str(&self) -> String { + pub fn to_string(&self) -> String { let blk: *Block = self; format!("[block {}]", blk) } @@ -653,7 +653,7 @@ pub fn const_get_elt(cx: &CrateContext, v: ValueRef, us: &[c_uint]) let r = llvm::LLVMConstExtractValue(v, us.as_ptr(), us.len() as c_uint); debug!("const_get_elt(v={}, us={:?}, r={})", - cx.tn.val_to_str(v), us, cx.tn.val_to_str(r)); + cx.tn.val_to_string(v), us, cx.tn.val_to_string(r)); return r; } diff --git a/src/librustc/middle/trans/consts.rs b/src/librustc/middle/trans/consts.rs index 338821537e8c6..b846b2f082c47 100644 --- a/src/librustc/middle/trans/consts.rs +++ b/src/librustc/middle/trans/consts.rs @@ -59,7 +59,7 @@ pub fn const_lit(cx: &CrateContext, e: &ast::Expr, lit: ast::Lit) _ => cx.sess().span_bug(lit.span, format!("integer literal has type {} (expected int \ or uint)", - ty_to_str(cx.tcx(), lit_int_ty)).as_slice()) + ty_to_string(cx.tcx(), lit_int_ty)).as_slice()) } } ast::LitFloat(ref fs, t) => { @@ -155,14 +155,14 @@ fn const_deref(cx: &CrateContext, v: ValueRef, t: ty::t, explicit: bool) } _ => { cx.sess().bug(format!("unexpected dereferenceable type {}", - ty_to_str(cx.tcx(), t)).as_slice()) + ty_to_string(cx.tcx(), t)).as_slice()) } }; (dv, mt.ty) } None => { cx.sess().bug(format!("can't dereference const of type {}", - ty_to_str(cx.tcx(), t)).as_slice()) + ty_to_string(cx.tcx(), t)).as_slice()) } } } @@ -285,7 +285,7 @@ pub fn const_expr(cx: &CrateContext, e: &ast::Expr, is_local: bool) -> (ValueRef llvm::LLVMDumpValue(C_undef(llty)); } cx.sess().bug(format!("const {} of type {} has size {} instead of {}", - e.repr(cx.tcx()), ty_to_str(cx.tcx(), ety), + e.repr(cx.tcx()), ty_to_string(cx.tcx(), ety), csize, tsize).as_slice()); } (llconst, inlineable) diff --git a/src/librustc/middle/trans/controlflow.rs b/src/librustc/middle/trans/controlflow.rs index e9b1c56eb0032..03936257860a6 100644 --- a/src/librustc/middle/trans/controlflow.rs +++ b/src/librustc/middle/trans/controlflow.rs @@ -126,8 +126,8 @@ pub fn trans_if<'a>(bcx: &'a Block<'a>, dest: expr::Dest) -> &'a Block<'a> { debug!("trans_if(bcx={}, if_id={}, cond={}, thn={:?}, dest={})", - bcx.to_str(), if_id, bcx.expr_to_str(cond), thn.id, - dest.to_str(bcx.ccx())); + bcx.to_string(), if_id, bcx.expr_to_string(cond), thn.id, + dest.to_string(bcx.ccx())); let _icx = push_ctxt("trans_if"); let mut bcx = bcx; diff --git a/src/librustc/middle/trans/datum.rs b/src/librustc/middle/trans/datum.rs index 158a7d6cf7ab9..a77b7d63a9064 100644 --- a/src/librustc/middle/trans/datum.rs +++ b/src/librustc/middle/trans/datum.rs @@ -618,10 +618,10 @@ impl Datum { } #[allow(dead_code)] // useful for debugging - pub fn to_str(&self, ccx: &CrateContext) -> String { + pub fn to_string(&self, ccx: &CrateContext) -> String { format!("Datum({}, {}, {:?})", - ccx.tn.val_to_str(self.val), - ty_to_str(ccx.tcx(), self.ty), + ccx.tn.val_to_string(self.val), + ty_to_string(ccx.tcx(), self.ty), self.kind) } diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index 783fdfa4aaec9..4ac328dcde8b8 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -263,7 +263,7 @@ impl TypeMap { metadata: DIType) { if !self.type_to_metadata.insert(ty::type_id(type_), metadata) { cx.sess().bug(format!("Type metadata for ty::t '{}' is already in the TypeMap!", - ppaux::ty_to_str(cx.tcx(), type_)).as_slice()); + ppaux::ty_to_string(cx.tcx(), type_)).as_slice()); } } @@ -338,7 +338,7 @@ impl TypeMap { ty::ty_int(_) | ty::ty_uint(_) | ty::ty_float(_) => { - unique_type_id.push_str(ppaux::ty_to_str(cx.tcx(), type_).as_slice()); + unique_type_id.push_str(ppaux::ty_to_string(cx.tcx(), type_).as_slice()); }, ty::ty_enum(def_id, ref substs) => { unique_type_id.push_str("enum "); @@ -497,7 +497,7 @@ impl TypeMap { }, _ => { cx.sess().bug(format!("get_unique_type_id_of_type() - unexpected type: {}, {:?}", - ppaux::ty_to_str(cx.tcx(), type_).as_slice(), + ppaux::ty_to_string(cx.tcx(), type_).as_slice(), ty::get(type_).sty).as_slice()) } }; @@ -517,7 +517,7 @@ impl TypeMap { def_id: ast::DefId, substs: &subst::Substs, output: &mut String) { - use std::num::ToStrRadix; + use std::num::ToStringRadix; // First, find out the 'real' def_id of the type. Items inlined from // other crates have to be mapped back to their source. @@ -788,7 +788,7 @@ pub fn create_global_var_metadata(cx: &CrateContext, let type_metadata = type_metadata(cx, variable_type, span); let namespace_node = namespace_for_item(cx, ast_util::local_def(node_id)); - let var_name = token::get_ident(ident).get().to_str(); + let var_name = token::get_ident(ident).get().to_string(); let linkage_name = namespace_node.mangled_name_of_contained_item(var_name.as_slice()); let var_scope = namespace_node.scope; @@ -1021,7 +1021,7 @@ pub fn set_source_location(fcx: &FunctionContext, FunctionDebugContext(box ref function_debug_context) => { let cx = fcx.ccx; - debug!("set_source_location: {}", cx.sess().codemap().span_to_str(span)); + debug!("set_source_location: {}", cx.sess().codemap().span_to_string(span)); if function_debug_context.source_locations_enabled.get() { let loc = span_start(cx, span); @@ -1304,7 +1304,7 @@ pub fn create_function_debug_context(cx: &CrateContext, if has_self_type { let actual_self_type = self_type.unwrap(); // Add self type name to <...> clause of function name - let actual_self_type_name = ppaux::ty_to_str(cx.tcx(), actual_self_type); + let actual_self_type_name = ppaux::ty_to_string(cx.tcx(), actual_self_type); name_to_append_suffix_to.push_str( actual_self_type_name.as_slice()); @@ -1343,7 +1343,7 @@ pub fn create_function_debug_context(cx: &CrateContext, for (index, &ast::TyParam{ ident: ident, .. }) in generics.ty_params.iter().enumerate() { let actual_type = *actual_types.get(index); // Add actual type name to <...> clause of function name - let actual_type_name = ppaux::ty_to_str(cx.tcx(), actual_type); + let actual_type_name = ppaux::ty_to_string(cx.tcx(), actual_type); name_to_append_suffix_to.push_str(actual_type_name.as_slice()); if index != generics.ty_params.len() - 1 { @@ -1648,7 +1648,7 @@ fn pointer_type_metadata(cx: &CrateContext, -> DIType { let pointer_llvm_type = type_of::type_of(cx, pointer_type); let (pointer_size, pointer_align) = size_and_align_of(cx, pointer_llvm_type); - let name = ppaux::ty_to_str(cx.tcx(), pointer_type); + let name = ppaux::ty_to_string(cx.tcx(), pointer_type); let ptr_metadata = name.as_slice().with_c_str(|name| { unsafe { llvm::LLVMDIBuilderCreatePointerType( @@ -1777,7 +1777,7 @@ impl RecursiveTypeDescription { type_map.find_metadata_for_type(unfinished_type).is_none() { cx.sess().bug(format!("Forward declaration of potentially recursive type \ '{}' was not found in TypeMap!", - ppaux::ty_to_str(cx.tcx(), unfinished_type)) + ppaux::ty_to_string(cx.tcx(), unfinished_type)) .as_slice()); } } @@ -1854,7 +1854,7 @@ fn prepare_struct_metadata(cx: &CrateContext, unique_type_id: UniqueTypeId, span: Span) -> RecursiveTypeDescription { - let struct_name = ppaux::ty_to_str(cx.tcx(), struct_type); + let struct_name = ppaux::ty_to_string(cx.tcx(), struct_type); let struct_llvm_type = type_of::type_of(cx, struct_type); let (containing_scope, definition_span) = get_namespace_and_span_for_item(cx, def_id); @@ -1918,7 +1918,7 @@ fn prepare_tuple_metadata(cx: &CrateContext, unique_type_id: UniqueTypeId, span: Span) -> RecursiveTypeDescription { - let tuple_name = ppaux::ty_to_str(cx.tcx(), tuple_type); + let tuple_name = ppaux::ty_to_string(cx.tcx(), tuple_type); let tuple_llvm_type = type_of::type_of(cx, tuple_type); let loc = span_start(cx, span); @@ -2237,7 +2237,7 @@ fn describe_enum_variant(cx: &CrateContext, Some(ref names) => { names.iter() .map(|ident| { - token::get_ident(*ident).get().to_str().into_string() + token::get_ident(*ident).get().to_string().into_string() }).collect() } None => variant_info.args.iter().map(|_| "".to_string()).collect() @@ -2276,7 +2276,7 @@ fn prepare_enum_metadata(cx: &CrateContext, unique_type_id: UniqueTypeId, span: Span) -> RecursiveTypeDescription { - let enum_name = ppaux::ty_to_str(cx.tcx(), enum_type); + let enum_name = ppaux::ty_to_string(cx.tcx(), enum_type); let (containing_scope, definition_span) = get_namespace_and_span_for_item(cx, enum_def_id); let loc = span_start(cx, definition_span); @@ -2577,7 +2577,7 @@ fn at_box_metadata(cx: &CrateContext, None => { /* proceed */ } }; - let content_type_name = ppaux::ty_to_str(cx.tcx(), content_type); + let content_type_name = ppaux::ty_to_string(cx.tcx(), content_type); let content_type_name = content_type_name.as_slice(); let content_llvm_type = type_of::type_of(cx, content_type); @@ -2718,7 +2718,7 @@ fn heap_vec_metadata(cx: &CrateContext, }; let vecbox_llvm_type = Type::vec(cx, &element_llvm_type); - let vec_pointer_type_name = ppaux::ty_to_str(cx.tcx(), vec_pointer_type); + let vec_pointer_type_name = ppaux::ty_to_string(cx.tcx(), vec_pointer_type); let vec_pointer_type_name = vec_pointer_type_name.as_slice(); let member_llvm_types = vecbox_llvm_type.field_types(); @@ -2797,7 +2797,7 @@ fn vec_slice_metadata(cx: &CrateContext, }; let slice_llvm_type = type_of::type_of(cx, vec_type); - let slice_type_name = ppaux::ty_to_str(cx.tcx(), vec_type); + let slice_type_name = ppaux::ty_to_string(cx.tcx(), vec_type); let member_llvm_types = slice_llvm_type.field_types(); assert!(slice_layout_is_correct(cx, @@ -2891,7 +2891,7 @@ fn trait_metadata(cx: &CrateContext, // But it does not describe the trait's methods. let last = ty::with_path(cx.tcx(), def_id, |mut path| path.last().unwrap()); let ident_string = token::get_name(last.name()); - let mut name = ppaux::trait_store_to_str(cx.tcx(), trait_store); + let mut name = ppaux::trait_store_to_string(cx.tcx(), trait_store); name.push_str(ident_string.get()); // Add type and region parameters @@ -3079,7 +3079,7 @@ fn type_metadata(cx: &CrateContext, the debuginfo::TypeMap but it \ was not. (ty::t = {})", unique_type_id_str.as_slice(), - ppaux::ty_to_str(cx.tcx(), t)); + ppaux::ty_to_string(cx.tcx(), t)); cx.sess().span_bug(usage_site_span, error_message.as_slice()); } }; @@ -3094,7 +3094,7 @@ fn type_metadata(cx: &CrateContext, debuginfo::TypeMap. \ UniqueTypeId={}, ty::t={}", unique_type_id_str.as_slice(), - ppaux::ty_to_str(cx.tcx(), t)); + ppaux::ty_to_string(cx.tcx(), t)); cx.sess().span_bug(usage_site_span, error_message.as_slice()); } } diff --git a/src/librustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs index 9c957eec90acd..79630efccaec8 100644 --- a/src/librustc/middle/trans/expr.rs +++ b/src/librustc/middle/trans/expr.rs @@ -91,9 +91,9 @@ pub enum Dest { } impl Dest { - pub fn to_str(&self, ccx: &CrateContext) -> String { + pub fn to_string(&self, ccx: &CrateContext) -> String { match *self { - SaveIn(v) => format!("SaveIn({})", ccx.tn.val_to_str(v)), + SaveIn(v) => format!("SaveIn({})", ccx.tn.val_to_string(v)), Ignore => "Ignore".to_string() } } @@ -148,7 +148,7 @@ pub fn trans<'a>(bcx: &'a Block<'a>, * the stack. */ - debug!("trans(expr={})", bcx.expr_to_str(expr)); + debug!("trans(expr={})", bcx.expr_to_string(expr)); let mut bcx = bcx; let fcx = bcx.fcx; @@ -178,7 +178,7 @@ fn apply_adjustments<'a>(bcx: &'a Block<'a>, Some(adj) => { adj } }; debug!("unadjusted datum for expr {}: {}", - expr.id, datum.to_str(bcx.ccx())); + expr.id, datum.to_string(bcx.ccx())); match adjustment { AutoAddEnv(..) => { datum = unpack_datum!(bcx, add_env(bcx, expr, datum)); @@ -216,7 +216,7 @@ fn apply_adjustments<'a>(bcx: &'a Block<'a>, datum = scratch.to_expr_datum(); } } - debug!("after adjustments, datum={}", datum.to_str(bcx.ccx())); + debug!("after adjustments, datum={}", datum.to_string(bcx.ccx())); return DatumBlock {bcx: bcx, datum: datum}; fn auto_slice<'a>( @@ -321,7 +321,7 @@ fn trans_unadjusted<'a>(bcx: &'a Block<'a>, let mut bcx = bcx; - debug!("trans_unadjusted(expr={})", bcx.expr_to_str(expr)); + debug!("trans_unadjusted(expr={})", bcx.expr_to_string(expr)); let _indenter = indenter(); debuginfo::set_source_location(bcx.fcx, expr.id, expr.span); @@ -496,8 +496,8 @@ fn trans_index<'a>(bcx: &'a Block<'a>, let (base, len) = base_datum.get_vec_base_and_len(bcx); - debug!("trans_index: base {}", bcx.val_to_str(base)); - debug!("trans_index: len {}", bcx.val_to_str(len)); + debug!("trans_index: base {}", bcx.val_to_string(base)); + debug!("trans_index: len {}", bcx.val_to_string(len)); let bounds_check = ICmp(bcx, lib::llvm::IntUGE, ix_val, len); let expect = ccx.get_intrinsic(&("llvm.expect.i1")); @@ -721,7 +721,7 @@ fn trans_rvalue_dps_unadjusted<'a>(bcx: &'a Block<'a>, let expr_ty = expr_ty(bcx, expr); let store = ty::ty_closure_store(expr_ty); debug!("translating block function {} with type {}", - expr_to_str(expr), expr_ty.repr(tcx)); + expr_to_string(expr), expr_ty.repr(tcx)); closure::trans_expr_fn(bcx, store, &**decl, &**body, expr.id, dest) } ast::ExprCall(ref f, ref args) => { @@ -834,7 +834,7 @@ fn trans_def_dps_unadjusted<'a>( _ => { bcx.tcx().sess.span_bug(ref_expr.span, format!( "Non-DPS def {:?} referened by {}", - def, bcx.node_id_to_str(ref_expr.id)).as_slice()); + def, bcx.node_id_to_string(ref_expr.id)).as_slice()); } } } @@ -915,7 +915,7 @@ pub fn trans_local_var<'a>(bcx: &'a Block<'a>, } }; debug!("take_local(nid={:?}, v={}, ty={})", - nid, bcx.val_to_str(datum.val), bcx.ty_to_str(datum.ty)); + nid, bcx.val_to_string(datum.val), bcx.ty_to_string(datum.ty)); datum } } @@ -1416,13 +1416,13 @@ fn trans_binary<'a>(bcx: &'a Block<'a>, debug!("trans_binary (expr {}): lhs_datum={}", expr.id, - lhs_datum.to_str(ccx)); + lhs_datum.to_string(ccx)); let lhs_ty = lhs_datum.ty; let lhs = lhs_datum.to_llscalarish(bcx); debug!("trans_binary (expr {}): rhs_datum={}", expr.id, - rhs_datum.to_str(ccx)); + rhs_datum.to_string(ccx)); let rhs_ty = rhs_datum.ty; let rhs = rhs_datum.to_llscalarish(bcx); trans_eager_binop(bcx, expr, binop_ty, op, @@ -1683,7 +1683,7 @@ fn trans_assign_op<'a>( let _icx = push_ctxt("trans_assign_op"); let mut bcx = bcx; - debug!("trans_assign_op(expr={})", bcx.expr_to_str(expr)); + debug!("trans_assign_op(expr={})", bcx.expr_to_string(expr)); // User-defined operator methods cannot be used with `+=` etc right now assert!(!bcx.tcx().method_map.borrow().contains_key(&MethodCall::expr(expr.id))); @@ -1753,7 +1753,7 @@ fn deref_once<'a>(bcx: &'a Block<'a>, debug!("deref_once(expr={}, datum={}, method_call={})", expr.repr(bcx.tcx()), - datum.to_str(ccx), + datum.to_string(ccx), method_call); let mut bcx = bcx; @@ -1831,7 +1831,7 @@ fn deref_once<'a>(bcx: &'a Block<'a>, }; debug!("deref_once(expr={}, method_call={}, result={})", - expr.id, method_call, r.datum.to_str(ccx)); + expr.id, method_call, r.datum.to_string(ccx)); return r; diff --git a/src/librustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs index b43b47573b95f..2fd18c8a99fb1 100644 --- a/src/librustc/middle/trans/foreign.rs +++ b/src/librustc/middle/trans/foreign.rs @@ -267,8 +267,8 @@ pub fn trans_native_call<'a>( llfn={}, \ llretptr={})", callee_ty.repr(tcx), - ccx.tn.val_to_str(llfn), - ccx.tn.val_to_str(llretptr)); + ccx.tn.val_to_string(llfn), + ccx.tn.val_to_string(llretptr)); let (fn_abi, fn_sig) = match ty::get(callee_ty).sty { ty::ty_bare_fn(ref fn_ty) => (fn_ty.abi, fn_ty.sig.clone()), @@ -315,9 +315,9 @@ pub fn trans_native_call<'a>( debug!("argument {}, llarg_rust={}, rust_indirect={}, arg_ty={}", i, - ccx.tn.val_to_str(llarg_rust), + ccx.tn.val_to_string(llarg_rust), rust_indirect, - ccx.tn.type_to_str(arg_tys[i].ty)); + ccx.tn.type_to_string(arg_tys[i].ty)); // Ensure that we always have the Rust value indirectly, // because it makes bitcasting easier. @@ -331,7 +331,7 @@ pub fn trans_native_call<'a>( } debug!("llarg_rust={} (after indirection)", - ccx.tn.val_to_str(llarg_rust)); + ccx.tn.val_to_string(llarg_rust)); // Check whether we need to do any casting match arg_tys[i].cast { @@ -340,7 +340,7 @@ pub fn trans_native_call<'a>( } debug!("llarg_rust={} (after casting)", - ccx.tn.val_to_str(llarg_rust)); + ccx.tn.val_to_string(llarg_rust)); // Finally, load the value if needed for the foreign ABI let foreign_indirect = arg_tys[i].is_indirect(); @@ -351,7 +351,7 @@ pub fn trans_native_call<'a>( }; debug!("argument {}, llarg_foreign={}", - i, ccx.tn.val_to_str(llarg_foreign)); + i, ccx.tn.val_to_string(llarg_foreign)); // fill padding with undef value match arg_tys[i].pad { @@ -403,10 +403,10 @@ pub fn trans_native_call<'a>( None => fn_type.ret_ty.ty }; - debug!("llretptr={}", ccx.tn.val_to_str(llretptr)); - debug!("llforeign_retval={}", ccx.tn.val_to_str(llforeign_retval)); - debug!("llrust_ret_ty={}", ccx.tn.type_to_str(llrust_ret_ty)); - debug!("llforeign_ret_ty={}", ccx.tn.type_to_str(llforeign_ret_ty)); + debug!("llretptr={}", ccx.tn.val_to_string(llretptr)); + debug!("llforeign_retval={}", ccx.tn.val_to_string(llforeign_retval)); + debug!("llrust_ret_ty={}", ccx.tn.type_to_string(llrust_ret_ty)); + debug!("llforeign_ret_ty={}", ccx.tn.type_to_string(llforeign_ret_ty)); if llrust_ret_ty == llforeign_ret_ty { Store(bcx, llforeign_retval, llretptr); @@ -511,7 +511,7 @@ pub fn register_rust_fn_with_foreign_abi(ccx: &CrateContext, let llfn = base::register_fn_llvmty(ccx, sp, sym, node_id, cconv, llfn_ty); add_argument_attributes(&tys, llfn); debug!("register_rust_fn_with_foreign_abi(node_id={:?}, llfn_ty={}, llfn={})", - node_id, ccx.tn.type_to_str(llfn_ty), ccx.tn.val_to_str(llfn)); + node_id, ccx.tn.type_to_string(llfn_ty), ccx.tn.val_to_string(llfn)); llfn } @@ -556,13 +556,13 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, _ => { ccx.sess().bug(format!("build_rust_fn: extern fn {} has ty {}, \ expected a bare fn ty", - ccx.tcx.map.path_to_str(id), + ccx.tcx.map.path_to_string(id), t.repr(tcx)).as_slice()); } }; debug!("build_rust_fn: path={} id={} t={}", - ccx.tcx.map.path_to_str(id), + ccx.tcx.map.path_to_string(id), id, t.repr(tcx)); let llfn = base::decl_internal_rust_fn(ccx, t, ps.as_slice()); @@ -583,8 +583,8 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, let t = ty::node_id_to_type(tcx, id); debug!("build_wrap_fn(llrustfn={}, llwrapfn={}, t={})", - ccx.tn.val_to_str(llrustfn), - ccx.tn.val_to_str(llwrapfn), + ccx.tn.val_to_string(llrustfn), + ccx.tn.val_to_string(llwrapfn), t.repr(ccx.tcx())); // Avoid all the Rust generation stuff and just generate raw @@ -641,14 +641,14 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, match foreign_outptr { Some(llforeign_outptr) => { debug!("out pointer, foreign={}", - ccx.tn.val_to_str(llforeign_outptr)); + ccx.tn.val_to_string(llforeign_outptr)); let llrust_retptr = llvm::LLVMBuildBitCast(builder, llforeign_outptr, llrust_ret_ty.ptr_to().to_ref(), noname()); debug!("out pointer, foreign={} (casted)", - ccx.tn.val_to_str(llrust_retptr)); + ccx.tn.val_to_string(llrust_retptr)); llrust_args.push(llrust_retptr); return_alloca = None; } @@ -664,8 +664,8 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, allocad={}, \ llrust_ret_ty={}, \ return_ty={}", - ccx.tn.val_to_str(slot), - ccx.tn.type_to_str(llrust_ret_ty), + ccx.tn.val_to_string(slot), + ccx.tn.type_to_string(llrust_ret_ty), tys.fn_sig.output.repr(tcx)); llrust_args.push(slot); return_alloca = Some(slot); @@ -693,7 +693,7 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, let mut llforeign_arg = llvm::LLVMGetParam(llwrapfn, foreign_index); debug!("llforeign_arg {}{}: {}", "#", - i, ccx.tn.val_to_str(llforeign_arg)); + i, ccx.tn.val_to_string(llforeign_arg)); debug!("rust_indirect = {}, foreign_indirect = {}", rust_indirect, foreign_indirect); @@ -726,12 +726,12 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, }; debug!("llrust_arg {}{}: {}", "#", - i, ccx.tn.val_to_str(llrust_arg)); + i, ccx.tn.val_to_string(llrust_arg)); llrust_args.push(llrust_arg); } // Perform the call itself - debug!("calling llrustfn = {}, t = {}", ccx.tn.val_to_str(llrustfn), t.repr(ccx.tcx())); + debug!("calling llrustfn = {}, t = {}", ccx.tn.val_to_string(llrustfn), t.repr(ccx.tcx())); let llrust_ret_val = llvm::LLVMBuildCall(builder, llrustfn, llrust_args.as_ptr(), llrust_args.len() as c_uint, noname()); @@ -871,10 +871,10 @@ fn foreign_types_for_fn_ty(ccx: &CrateContext, fn_ty={} -> {}, \ ret_def={}", ty.repr(ccx.tcx()), - ccx.tn.types_to_str(llsig.llarg_tys.as_slice()), - ccx.tn.type_to_str(llsig.llret_ty), - ccx.tn.types_to_str(fn_ty.arg_tys.iter().map(|t| t.ty).collect::>().as_slice()), - ccx.tn.type_to_str(fn_ty.ret_ty.ty), + ccx.tn.types_to_string(llsig.llarg_tys.as_slice()), + ccx.tn.type_to_string(llsig.llret_ty), + ccx.tn.types_to_string(fn_ty.arg_tys.iter().map(|t| t.ty).collect::>().as_slice()), + ccx.tn.type_to_string(fn_ty.ret_ty.ty), ret_def); ForeignTypes { diff --git a/src/librustc/middle/trans/glue.rs b/src/librustc/middle/trans/glue.rs index 7024ea4b37569..bbe79ae6c1934 100644 --- a/src/librustc/middle/trans/glue.rs +++ b/src/librustc/middle/trans/glue.rs @@ -167,11 +167,11 @@ pub fn lazily_emit_visit_glue(ccx: &CrateContext, ti: &tydesc_info) -> ValueRef match ti.visit_glue.get() { Some(visit_glue) => visit_glue, None => { - debug!("+++ lazily_emit_tydesc_glue VISIT {}", ppaux::ty_to_str(ccx.tcx(), ti.ty)); + debug!("+++ lazily_emit_tydesc_glue VISIT {}", ppaux::ty_to_string(ccx.tcx(), ti.ty)); let glue_fn = declare_generic_glue(ccx, ti.ty, llfnty, "visit"); ti.visit_glue.set(Some(glue_fn)); make_generic_glue(ccx, ti.ty, glue_fn, make_visit_glue, "visit"); - debug!("--- lazily_emit_tydesc_glue VISIT {}", ppaux::ty_to_str(ccx.tcx(), ti.ty)); + debug!("--- lazily_emit_tydesc_glue VISIT {}", ppaux::ty_to_string(ccx.tcx(), ti.ty)); glue_fn } } @@ -432,13 +432,13 @@ pub fn declare_tydesc(ccx: &CrateContext, t: ty::t) -> tydesc_info { if ccx.sess().count_type_sizes() { println!("{}\t{}", llsize_of_real(ccx, llty), - ppaux::ty_to_str(ccx.tcx(), t)); + ppaux::ty_to_string(ccx.tcx(), t)); } let llsize = llsize_of(ccx, llty); let llalign = llalign_of(ccx, llty); let name = mangle_internal_name_by_type_and_seq(ccx, t, "tydesc"); - debug!("+++ declare_tydesc {} {}", ppaux::ty_to_str(ccx.tcx(), t), name); + debug!("+++ declare_tydesc {} {}", ppaux::ty_to_string(ccx.tcx(), t), name); let gvar = name.as_slice().with_c_str(|buf| { unsafe { llvm::LLVMAddGlobal(ccx.llmod, ccx.tydesc_type().to_ref(), buf) @@ -447,10 +447,10 @@ pub fn declare_tydesc(ccx: &CrateContext, t: ty::t) -> tydesc_info { note_unique_llvm_symbol(ccx, name); let ty_name = token::intern_and_get_ident( - ppaux::ty_to_str(ccx.tcx(), t).as_slice()); + ppaux::ty_to_string(ccx.tcx(), t).as_slice()); let ty_name = C_str_slice(ccx, ty_name); - debug!("--- declare_tydesc {}", ppaux::ty_to_str(ccx.tcx(), t)); + debug!("--- declare_tydesc {}", ppaux::ty_to_string(ccx.tcx(), t)); tydesc_info { ty: t, tydesc: gvar, @@ -468,7 +468,7 @@ fn declare_generic_glue(ccx: &CrateContext, t: ty::t, llfnty: Type, ccx, t, format!("glue_{}", name).as_slice()); - debug!("{} is for type {}", fn_nm, ppaux::ty_to_str(ccx.tcx(), t)); + debug!("{} is for type {}", fn_nm, ppaux::ty_to_string(ccx.tcx(), t)); let llfn = decl_cdecl_fn(ccx, fn_nm.as_slice(), llfnty, ty::mk_nil()); note_unique_llvm_symbol(ccx, fn_nm); return llfn; diff --git a/src/librustc/middle/trans/intrinsic.rs b/src/librustc/middle/trans/intrinsic.rs index 648a2c335e686..d8dc7a0ac230f 100644 --- a/src/librustc/middle/trans/intrinsic.rs +++ b/src/librustc/middle/trans/intrinsic.rs @@ -394,10 +394,10 @@ pub fn trans_intrinsic(ccx: &CrateContext, format!("transmute called on types with different sizes: \ {} ({} bit{}) to \ {} ({} bit{})", - ty_to_str(ccx.tcx(), in_type), + ty_to_string(ccx.tcx(), in_type), in_type_size, if in_type_size == 1 {""} else {"s"}, - ty_to_str(ccx.tcx(), out_type), + ty_to_string(ccx.tcx(), out_type), out_type_size, if out_type_size == 1 {""} else {"s"}).as_slice()); } @@ -583,14 +583,14 @@ pub fn check_intrinsics(ccx: &CrateContext) { .span_err(transmute_restriction.span, format!("transmute called on types with different sizes: \ {} ({} bit{}) to {} ({} bit{})", - ty_to_str(ccx.tcx(), transmute_restriction.from), + ty_to_string(ccx.tcx(), transmute_restriction.from), from_type_size as uint, if from_type_size == 1 { "" } else { "s" }, - ty_to_str(ccx.tcx(), transmute_restriction.to), + ty_to_string(ccx.tcx(), transmute_restriction.to), to_type_size as uint, if to_type_size == 1 { "" diff --git a/src/librustc/middle/trans/llrepr.rs b/src/librustc/middle/trans/llrepr.rs index 3cd1a59abef38..f7884ca5643f7 100644 --- a/src/librustc/middle/trans/llrepr.rs +++ b/src/librustc/middle/trans/llrepr.rs @@ -25,13 +25,13 @@ impl<'a, T:LlvmRepr> LlvmRepr for &'a [T] { impl LlvmRepr for Type { fn llrepr(&self, ccx: &CrateContext) -> String { - ccx.tn.type_to_str(*self) + ccx.tn.type_to_string(*self) } } impl LlvmRepr for ValueRef { fn llrepr(&self, ccx: &CrateContext) -> String { - ccx.tn.val_to_str(*self) + ccx.tn.val_to_string(*self) } } diff --git a/src/librustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs index 506817629565e..1e329ad9a899b 100644 --- a/src/librustc/middle/trans/reflect.rs +++ b/src/librustc/middle/trans/reflect.rs @@ -98,7 +98,7 @@ impl<'a, 'b> Reflector<'a, 'b> { debug!("passing {} args:", args.len()); let mut bcx = self.bcx; for (i, a) in args.iter().enumerate() { - debug!("arg {}: {}", i, bcx.val_to_str(*a)); + debug!("arg {}: {}", i, bcx.val_to_string(*a)); } let result = unpack_result!(bcx, callee::trans_call_inner( self.bcx, None, mth_ty, @@ -130,7 +130,7 @@ impl<'a, 'b> Reflector<'a, 'b> { pub fn visit_ty(&mut self, t: ty::t) { let bcx = self.bcx; let tcx = bcx.tcx(); - debug!("reflect::visit_ty {}", ty_to_str(bcx.tcx(), t)); + debug!("reflect::visit_ty {}", ty_to_string(bcx.tcx(), t)); match ty::get(t).sty { ty::ty_bot => self.leaf("bot"), @@ -177,7 +177,7 @@ impl<'a, 'b> Reflector<'a, 'b> { ty::ty_trait(..) => { let extra = [ self.c_slice(token::intern_and_get_ident( - ty_to_str(tcx, t).as_slice())) + ty_to_string(tcx, t).as_slice())) ]; self.visit("trait", extra); } @@ -206,7 +206,7 @@ impl<'a, 'b> Reflector<'a, 'b> { ty::ty_trait(..) => { let extra = [ self.c_slice(token::intern_and_get_ident( - ty_to_str(tcx, t).as_slice())) + ty_to_string(tcx, t).as_slice())) ]; self.visit("trait", extra); } @@ -271,7 +271,7 @@ impl<'a, 'b> Reflector<'a, 'b> { let extra = (vec!( self.c_slice( - token::intern_and_get_ident(ty_to_str(tcx, + token::intern_and_get_ident(ty_to_string(tcx, t).as_slice())), self.c_bool(named_fields), self.c_uint(fields.len()) diff --git a/src/librustc/middle/trans/tvec.rs b/src/librustc/middle/trans/tvec.rs index 65bf0b8500821..c672448bb6248 100644 --- a/src/librustc/middle/trans/tvec.rs +++ b/src/librustc/middle/trans/tvec.rs @@ -73,12 +73,12 @@ pub struct VecTypes { } impl VecTypes { - pub fn to_str(&self, ccx: &CrateContext) -> String { + pub fn to_string(&self, ccx: &CrateContext) -> String { format!("VecTypes {{unit_ty={}, llunit_ty={}, \ llunit_size={}, llunit_alloc_size={}}}", - ty_to_str(ccx.tcx(), self.unit_ty), - ccx.tn.type_to_str(self.llunit_ty), - ccx.tn.val_to_str(self.llunit_size), + ty_to_string(ccx.tcx(), self.unit_ty), + ccx.tn.type_to_string(self.llunit_ty), + ccx.tn.val_to_string(self.llunit_size), self.llunit_alloc_size) } } @@ -97,7 +97,7 @@ pub fn trans_fixed_vstore<'a>( // generate the content. debug!("trans_fixed_vstore(vstore_expr={}, dest={:?})", - bcx.expr_to_str(vstore_expr), dest.to_str(bcx.ccx())); + bcx.expr_to_string(vstore_expr), dest.to_string(bcx.ccx())); let vt = vec_types_from_expr(bcx, vstore_expr); @@ -129,7 +129,7 @@ pub fn trans_slice_vstore<'a>( let mut bcx = bcx; debug!("trans_slice_vstore(vstore_expr={}, dest={})", - bcx.expr_to_str(vstore_expr), dest.to_str(ccx)); + bcx.expr_to_string(vstore_expr), dest.to_string(ccx)); // Handle the &"..." case: match content_expr.node { @@ -150,7 +150,7 @@ pub fn trans_slice_vstore<'a>( // Handle the &[...] case: let vt = vec_types_from_expr(bcx, vstore_expr); let count = elements_required(bcx, content_expr); - debug!("vt={}, count={:?}", vt.to_str(ccx), count); + debug!("vt={}, count={:?}", vt.to_string(ccx), count); let llcount = C_uint(ccx, count); let llfixed; @@ -201,8 +201,8 @@ pub fn trans_lit_str<'a>( */ debug!("trans_lit_str(lit_expr={}, dest={})", - bcx.expr_to_str(lit_expr), - dest.to_str(bcx.ccx())); + bcx.expr_to_string(lit_expr), + dest.to_string(bcx.ccx())); match dest { Ignore => bcx, @@ -232,7 +232,7 @@ pub fn trans_uniq_vstore<'a>(bcx: &'a Block<'a>, * the array elements into them. */ - debug!("trans_uniq_vstore(vstore_expr={})", bcx.expr_to_str(vstore_expr)); + debug!("trans_uniq_vstore(vstore_expr={})", bcx.expr_to_string(vstore_expr)); let fcx = bcx.fcx; let ccx = fcx.ccx; @@ -296,7 +296,7 @@ pub fn trans_uniq_vstore<'a>(bcx: &'a Block<'a>, let dataptr = get_dataptr(bcx, val); debug!("alloc_uniq_vec() returned val={}, dataptr={}", - bcx.val_to_str(val), bcx.val_to_str(dataptr)); + bcx.val_to_string(val), bcx.val_to_string(dataptr)); let bcx = write_content(bcx, &vt, vstore_expr, content_expr, SaveIn(dataptr)); @@ -318,9 +318,9 @@ pub fn write_content<'a>( let mut bcx = bcx; debug!("write_content(vt={}, dest={}, vstore_expr={:?})", - vt.to_str(bcx.ccx()), - dest.to_str(bcx.ccx()), - bcx.expr_to_str(vstore_expr)); + vt.to_string(bcx.ccx()), + dest.to_string(bcx.ccx()), + bcx.expr_to_string(vstore_expr)); match content_expr.node { ast::ExprLit(lit) => { @@ -360,7 +360,7 @@ pub fn write_content<'a>( for (i, element) in elements.iter().enumerate() { let lleltptr = GEPi(bcx, lldest, [i]); debug!("writing index {:?} with lleltptr={:?}", - i, bcx.val_to_str(lleltptr)); + i, bcx.val_to_string(lleltptr)); bcx = expr::trans_into(bcx, &**element, SaveIn(lleltptr)); fcx.schedule_drop_mem( diff --git a/src/librustc/middle/trans/type_of.rs b/src/librustc/middle/trans/type_of.rs index 31bf6cb0110a4..8c8d4013e3d6f 100644 --- a/src/librustc/middle/trans/type_of.rs +++ b/src/librustc/middle/trans/type_of.rs @@ -191,7 +191,7 @@ pub fn type_of(cx: &CrateContext, t: ty::t) -> Type { t, t_norm.repr(cx.tcx()), t_norm, - cx.tn.type_to_str(llty)); + cx.tn.type_to_string(llty)); cx.lltypes.borrow_mut().insert(t, llty); return llty; } @@ -283,7 +283,7 @@ pub fn type_of(cx: &CrateContext, t: ty::t) -> Type { debug!("--> mapped t={} {:?} to llty={}", t.repr(cx.tcx()), t, - cx.tn.type_to_str(llty)); + cx.tn.type_to_string(llty)); cx.lltypes.borrow_mut().insert(t, llty); diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index c5e84b8e0c8f0..99b2718cea93b 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -2260,8 +2260,8 @@ pub fn is_instantiable(cx: &ctxt, r_ty: t) -> bool { fn type_requires(cx: &ctxt, seen: &mut Vec, r_ty: t, ty: t) -> bool { debug!("type_requires({}, {})?", - ::util::ppaux::ty_to_str(cx, r_ty), - ::util::ppaux::ty_to_str(cx, ty)); + ::util::ppaux::ty_to_string(cx, r_ty), + ::util::ppaux::ty_to_string(cx, ty)); let r = { get(r_ty).sty == get(ty).sty || @@ -2269,8 +2269,8 @@ pub fn is_instantiable(cx: &ctxt, r_ty: t) -> bool { }; debug!("type_requires({}, {})? {}", - ::util::ppaux::ty_to_str(cx, r_ty), - ::util::ppaux::ty_to_str(cx, ty), + ::util::ppaux::ty_to_string(cx, r_ty), + ::util::ppaux::ty_to_string(cx, ty), r); return r; } @@ -2278,8 +2278,8 @@ pub fn is_instantiable(cx: &ctxt, r_ty: t) -> bool { fn subtypes_require(cx: &ctxt, seen: &mut Vec, r_ty: t, ty: t) -> bool { debug!("subtypes_require({}, {})?", - ::util::ppaux::ty_to_str(cx, r_ty), - ::util::ppaux::ty_to_str(cx, ty)); + ::util::ppaux::ty_to_string(cx, r_ty), + ::util::ppaux::ty_to_string(cx, ty)); let r = match get(ty).sty { // fixed length vectors need special treatment compared to @@ -2354,8 +2354,8 @@ pub fn is_instantiable(cx: &ctxt, r_ty: t) -> bool { }; debug!("subtypes_require({}, {})? {}", - ::util::ppaux::ty_to_str(cx, r_ty), - ::util::ppaux::ty_to_str(cx, ty), + ::util::ppaux::ty_to_string(cx, r_ty), + ::util::ppaux::ty_to_string(cx, ty), r); return r; @@ -2398,7 +2398,7 @@ pub fn is_type_representable(cx: &ctxt, sp: Span, ty: t) -> Representability { fn type_structurally_recursive(cx: &ctxt, sp: Span, seen: &mut Vec, ty: t) -> Representability { debug!("type_structurally_recursive: {}", - ::util::ppaux::ty_to_str(cx, ty)); + ::util::ppaux::ty_to_string(cx, ty)); // Compare current type to previously seen types match get(ty).sty { @@ -2458,7 +2458,7 @@ pub fn is_type_representable(cx: &ctxt, sp: Span, ty: t) -> Representability { } debug!("is_type_representable: {}", - ::util::ppaux::ty_to_str(cx, ty)); + ::util::ppaux::ty_to_string(cx, ty)); // To avoid a stack overflow when checking an enum variant or struct that // contains a different, structurally recursive type, maintain a stack @@ -2597,7 +2597,7 @@ pub fn node_id_to_trait_ref(cx: &ctxt, id: ast::NodeId) -> Rc { Some(t) => t.clone(), None => cx.sess.bug( format!("node_id_to_trait_ref: no trait ref for node `{}`", - cx.map.node_to_str(id)).as_slice()) + cx.map.node_to_string(id)).as_slice()) } } @@ -2610,7 +2610,7 @@ pub fn node_id_to_type(cx: &ctxt, id: ast::NodeId) -> t { Some(t) => t, None => cx.sess.bug( format!("node_id_to_type: no type for node `{}`", - cx.map.node_to_str(id)).as_slice()) + cx.map.node_to_string(id)).as_slice()) } } @@ -2844,7 +2844,7 @@ pub fn adjust_ty(cx: &ctxt, format!("the {}th autoderef failed: \ {}", i, - ty_to_str(cx, adjusted_ty)) + ty_to_string(cx, adjusted_ty)) .as_slice()); } } @@ -3223,7 +3223,7 @@ pub fn ty_sort_str(cx: &ctxt, t: t) -> String { match get(t).sty { ty_nil | ty_bot | ty_bool | ty_char | ty_int(_) | ty_uint(_) | ty_float(_) | ty_str => { - ::util::ppaux::ty_to_str(cx, t) + ::util::ppaux::ty_to_string(cx, t) } ty_enum(id, _) => format!("enum {}", item_path_str(cx, id)), @@ -3255,7 +3255,7 @@ pub fn ty_sort_str(cx: &ctxt, t: t) -> String { } } -pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String { +pub fn type_err_to_string(cx: &ctxt, err: &type_err) -> String { /*! * * Explains the source of a type err in a short, @@ -3276,18 +3276,18 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String { terr_mismatch => "types differ".to_string(), terr_fn_style_mismatch(values) => { format!("expected {} fn but found {} fn", - values.expected.to_str(), - values.found.to_str()) + values.expected.to_string(), + values.found.to_string()) } terr_abi_mismatch(values) => { format!("expected {} fn but found {} fn", - values.expected.to_str(), - values.found.to_str()) + values.expected.to_string(), + values.found.to_string()) } terr_onceness_mismatch(values) => { format!("expected {} fn but found {} fn", - values.expected.to_str(), - values.found.to_str()) + values.expected.to_string(), + values.found.to_string()) } terr_sigil_mismatch(values) => { format!("expected {}, found {}", @@ -3343,17 +3343,17 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String { terr_regions_insufficiently_polymorphic(br, _) => { format!("expected bound lifetime parameter {}, \ but found concrete lifetime", - bound_region_ptr_to_str(cx, br)) + bound_region_ptr_to_string(cx, br)) } terr_regions_overly_polymorphic(br, _) => { format!("expected concrete lifetime, \ but found bound lifetime parameter {}", - bound_region_ptr_to_str(cx, br)) + bound_region_ptr_to_string(cx, br)) } terr_trait_stores_differ(_, ref values) => { format!("trait storage differs: expected `{}` but found `{}`", - trait_store_to_str(cx, (*values).expected), - trait_store_to_str(cx, (*values).found)) + trait_store_to_string(cx, (*values).expected), + trait_store_to_string(cx, (*values).found)) } terr_sorts(values) => { format!("expected {} but found {}", @@ -3383,13 +3383,13 @@ pub fn type_err_to_str(cx: &ctxt, err: &type_err) -> String { } terr_int_mismatch(ref values) => { format!("expected `{}` but found `{}`", - values.expected.to_str(), - values.found.to_str()) + values.expected.to_string(), + values.found.to_string()) } terr_float_mismatch(ref values) => { format!("expected `{}` but found `{}`", - values.expected.to_str(), - values.found.to_str()) + values.expected.to_string(), + values.found.to_string()) } terr_variadic_mismatch(ref values) => { format!("expected {} fn but found {} function", @@ -3700,7 +3700,7 @@ pub fn substd_enum_variants(cx: &ctxt, } pub fn item_path_str(cx: &ctxt, id: ast::DefId) -> String { - with_path(cx, id, |path| ast_map::path_to_str(path)).to_string() + with_path(cx, id, |path| ast_map::path_to_string(path)).to_string() } pub enum DtorKind { @@ -3972,7 +3972,7 @@ fn each_super_struct(cx: &ctxt, mut did: ast::DefId, f: |ast::DefId|) { None => { cx.sess.bug( format!("ID not mapped to super-struct: {}", - cx.map.node_to_str(did.node)).as_slice()); + cx.map.node_to_string(did.node)).as_slice()); } } } @@ -3994,7 +3994,7 @@ pub fn lookup_struct_fields(cx: &ctxt, did: ast::DefId) -> Vec { _ => { cx.sess.bug( format!("ID not mapped to struct fields: {}", - cx.map.node_to_str(did.node)).as_slice()); + cx.map.node_to_string(did.node)).as_slice()); } } }); @@ -4614,7 +4614,7 @@ pub fn hash_crate_independent(tcx: &ctxt, t: t, svh: &Svh) -> u64 { } impl Variance { - pub fn to_str(self) -> &'static str { + pub fn to_string(self) -> &'static str { match self { Covariant => "+", Contravariant => "-", diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 7ca8a74ae636c..8507508b287b7 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/src/librustc/middle/typeck/astconv.rs @@ -109,7 +109,7 @@ pub fn ast_region_to_region(tcx: &ty::ctxt, lifetime: &ast::Lifetime) }; debug!("ast_region_to_region(lifetime={} id={}) yields {}", - lifetime_to_str(lifetime), + lifetime_to_string(lifetime), lifetime.id, r.repr(tcx)); r @@ -143,7 +143,7 @@ pub fn opt_ast_region_to_region( }; debug!("opt_ast_region_to_region(opt_lifetime={:?}) yields {}", - opt_lifetime.as_ref().map(|e| lifetime_to_str(e)), + opt_lifetime.as_ref().map(|e| lifetime_to_string(e)), r.repr(this.tcx())); r @@ -332,7 +332,7 @@ pub fn ast_ty_to_prim_ty(tcx: &ty::ctxt, ast_ty: &ast::Ty) -> Option { None => { tcx.sess.span_bug(ast_ty.span, format!("unbound path {}", - path_to_str(path)).as_slice()) + path_to_string(path)).as_slice()) } Some(&d) => d }; @@ -402,7 +402,7 @@ pub fn ast_ty_to_builtin_ty d }; @@ -801,7 +801,7 @@ pub fn ast_ty_to_ty( tcx.sess .span_bug(ast_ty.span, format!("unbound path {}", - path_to_str(path)).as_slice()) + path_to_string(path)).as_slice()) } Some(&d) => d }; @@ -816,7 +816,7 @@ pub fn ast_ty_to_ty( } match a_def { def::DefTrait(_) => { - let path_str = path_to_str(path); + let path_str = path_to_string(path); tcx.sess.span_err( ast_ty.span, format!("reference to trait `{name}` where a \ @@ -843,7 +843,7 @@ pub fn ast_ty_to_ty( def::DefMod(id) => { tcx.sess.span_fatal(ast_ty.span, format!("found module name used as a type: {}", - tcx.map.node_to_str(id.node)).as_slice()); + tcx.map.node_to_string(id.node)).as_slice()); } def::DefPrimTy(_) => { fail!("DefPrimTy arm missed in previous ast_ty_to_prim_ty call"); diff --git a/src/librustc/middle/typeck/check/_match.rs b/src/librustc/middle/typeck/check/_match.rs index e198653165a61..c0ae907b8c7e9 100644 --- a/src/librustc/middle/typeck/check/_match.rs +++ b/src/librustc/middle/typeck/check/_match.rs @@ -376,12 +376,12 @@ pub fn check_struct_pat(pcx: &pat_ctxt, pat_id: ast::NodeId, span: Span, // OK. } Some(&def::DefStruct(..)) | Some(&def::DefVariant(..)) => { - let name = pprust::path_to_str(path); + let name = pprust::path_to_string(path); tcx.sess .span_err(span, format!("mismatched types: expected `{}` but found \ `{}`", - fcx.infcx().ty_to_str(expected), + fcx.infcx().ty_to_string(expected), name).as_slice()); } _ => { @@ -416,11 +416,11 @@ pub fn check_struct_like_enum_variant_pat(pcx: &pat_ctxt, variant_id, substitutions, etc); } Some(&def::DefStruct(..)) | Some(&def::DefVariant(..)) => { - let name = pprust::path_to_str(path); + let name = pprust::path_to_string(path); tcx.sess.span_err(span, format!("mismatched types: expected `{}` but \ found `{}`", - fcx.infcx().ty_to_str(expected), + fcx.infcx().ty_to_string(expected), name).as_slice()); } _ => { diff --git a/src/librustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs index fafc84d2b10f0..343d48a4bf973 100644 --- a/src/librustc/middle/typeck/check/method.rs +++ b/src/librustc/middle/typeck/check/method.rs @@ -30,14 +30,14 @@ itself (note that inherent impls can only be defined in the same module as the type itself). Inherent candidates are not always derived from impls. If you have a -trait instance, such as a value of type `Box`, then the trait -methods (`to_str()`, in this case) are inherently associated with it. +trait instance, such as a value of type `Box`, then the trait +methods (`to_string()`, in this case) are inherently associated with it. Another case is type parameters, in which case the methods of their bounds are inherent. Extension candidates are derived from imported traits. If I have the -trait `ToStr` imported, and I call `to_str()` on a value of type `T`, -then we will go off to find out whether there is an impl of `ToStr` +trait `ToString` imported, and I call `to_string()` on a value of type `T`, +then we will go off to find out whether there is an impl of `ToString` for `T`. These kinds of method calls are called "extension methods". They can be defined in any module, not only the one that defined `T`. Furthermore, you must import the trait to call such a method. @@ -373,7 +373,7 @@ impl<'a> LookupContext<'a> { autoderefs: uint) -> Option> { debug!("search_step: self_ty={} autoderefs={}", - self.ty_to_str(self_ty), autoderefs); + self.ty_to_string(self_ty), autoderefs); match self.deref_args { check::DontDerefArgs => { @@ -505,7 +505,7 @@ impl<'a> LookupContext<'a> { did: DefId, substs: &subst::Substs) { debug!("push_inherent_candidates_from_object(did={}, substs={})", - self.did_to_str(did), + self.did_to_string(did), substs.repr(self.tcx())); let _indenter = indenter(); let tcx = self.tcx(); @@ -730,7 +730,7 @@ impl<'a> LookupContext<'a> { None => None, Some(method) => { debug!("(searching for autoderef'd method) writing \ - adjustment {:?} for {}", adjustment, self.ty_to_str( self_ty)); + adjustment {:?} for {}", adjustment, self.ty_to_string( self_ty)); match adjustment { Some((self_expr_id, adj)) => { self.fcx.write_adjustment(self_expr_id, adj); @@ -806,7 +806,7 @@ impl<'a> LookupContext<'a> { fn auto_slice_vec(&self, mt: ty::mt, autoderefs: uint) -> Option { let tcx = self.tcx(); - debug!("auto_slice_vec {}", ppaux::ty_to_str(tcx, mt.ty)); + debug!("auto_slice_vec {}", ppaux::ty_to_string(tcx, mt.ty)); // First try to borrow to a slice let entry = self.search_for_some_kind_of_autorefd_method( @@ -883,7 +883,7 @@ impl<'a> LookupContext<'a> { * `~[]` to `&[]`. */ - debug!("search_for_autosliced_method {}", ppaux::ty_to_str(self.tcx(), self_ty)); + debug!("search_for_autosliced_method {}", ppaux::ty_to_string(self.tcx(), self_ty)); let sty = ty::get(self_ty).sty.clone(); match sty { @@ -936,7 +936,7 @@ impl<'a> LookupContext<'a> { ty_infer(TyVar(_)) => { self.bug(format!("unexpected type: {}", - self.ty_to_str(self_ty)).as_slice()); + self.ty_to_string(self_ty)).as_slice()); } } } @@ -990,7 +990,7 @@ impl<'a> LookupContext<'a> { } fn search_for_method(&self, rcvr_ty: ty::t) -> Option { - debug!("search_for_method(rcvr_ty={})", self.ty_to_str(rcvr_ty)); + debug!("search_for_method(rcvr_ty={})", self.ty_to_string(rcvr_ty)); let _indenter = indenter(); // I am not sure that inherent methods should have higher @@ -1091,7 +1091,7 @@ impl<'a> LookupContext<'a> { let tcx = self.tcx(); debug!("confirm_candidate(rcvr_ty={}, candidate={})", - self.ty_to_str(rcvr_ty), + self.ty_to_string(rcvr_ty), candidate.repr(self.tcx())); self.enforce_object_limitations(candidate); @@ -1174,7 +1174,7 @@ impl<'a> LookupContext<'a> { fn_style: bare_fn_ty.fn_style, abi: bare_fn_ty.abi.clone(), }); - debug!("after replacing bound regions, fty={}", self.ty_to_str(fty)); + debug!("after replacing bound regions, fty={}", self.ty_to_string(fty)); // Before, we only checked whether self_ty could be a subtype // of rcvr_ty; now we actually make it so (this may cause @@ -1188,8 +1188,8 @@ impl<'a> LookupContext<'a> { Err(_) => { self.bug(format!( "{} was a subtype of {} but now is not?", - self.ty_to_str(rcvr_ty), - self.ty_to_str(transformed_self_ty)).as_slice()); + self.ty_to_string(rcvr_ty), + self.ty_to_string(transformed_self_ty)).as_slice()); } } @@ -1292,7 +1292,7 @@ impl<'a> LookupContext<'a> { // candidate method's `self_ty`. fn is_relevant(&self, rcvr_ty: ty::t, candidate: &Candidate) -> bool { debug!("is_relevant(rcvr_ty={}, candidate={})", - self.ty_to_str(rcvr_ty), candidate.repr(self.tcx())); + self.ty_to_string(rcvr_ty), candidate.repr(self.tcx())); return match candidate.method_ty.explicit_self { SelfStatic => { @@ -1442,11 +1442,11 @@ impl<'a> LookupContext<'a> { self.fcx.tcx() } - fn ty_to_str(&self, t: ty::t) -> String { - self.fcx.infcx().ty_to_str(t) + fn ty_to_string(&self, t: ty::t) -> String { + self.fcx.infcx().ty_to_string(t) } - fn did_to_str(&self, did: DefId) -> String { + fn did_to_string(&self, did: DefId) -> String { ty::item_path_str(self.tcx(), did) } diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index 7b16248c2e6a2..6266ef273e588 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -383,8 +383,8 @@ impl<'a> Visitor<()> for GatherLocalsVisitor<'a> { }; self.assign(local.id, o_ty); debug!("Local variable {} is assigned type {}", - self.fcx.pat_to_str(&*local.pat), - self.fcx.infcx().ty_to_str( + self.fcx.pat_to_string(&*local.pat), + self.fcx.infcx().ty_to_string( self.fcx.inh.locals.borrow().get_copy(&local.id))); visit::walk_local(self, local, ()); } @@ -397,7 +397,7 @@ impl<'a> Visitor<()> for GatherLocalsVisitor<'a> { self.assign(p.id, None); debug!("Pattern binding {} is assigned to {}", token::get_ident(path.segments.get(0).identifier), - self.fcx.infcx().ty_to_str( + self.fcx.infcx().ty_to_string( self.fcx.inh.locals.borrow().get_copy(&p.id))); } _ => {} @@ -520,7 +520,7 @@ fn span_for_field(tcx: &ty::ctxt, field: &ty::field_ty, struct_id: ast::DefId) - let item = match tcx.map.find(struct_id.node) { Some(ast_map::NodeItem(item)) => item, None => fail!("node not in ast map: {}", struct_id.node), - _ => fail!("expected item, found {}", tcx.map.node_to_str(struct_id.node)) + _ => fail!("expected item, found {}", tcx.map.node_to_string(struct_id.node)) }; match item.node { @@ -788,7 +788,7 @@ fn check_impl_methods_against_trait(ccx: &CrateCtxt, format!( "method `{}` is not a member of trait `{}`", token::get_ident(impl_method_ty.ident), - pprust::path_to_str(&ast_trait_ref.path)).as_slice()); + pprust::path_to_string(&ast_trait_ref.path)).as_slice()); } } } @@ -855,7 +855,7 @@ fn compare_impl_method(tcx: &ty::ctxt, format!("method `{}` has a `{}` declaration in the impl, \ but not in the trait", token::get_ident(trait_m.ident), - pprust::explicit_self_to_str( + pprust::explicit_self_to_string( impl_m.explicit_self)).as_slice()); return; } @@ -865,7 +865,7 @@ fn compare_impl_method(tcx: &ty::ctxt, format!("method `{}` has a `{}` declaration in the trait, \ but not in the impl", token::get_ident(trait_m.ident), - pprust::explicit_self_to_str( + pprust::explicit_self_to_string( trait_m.explicit_self)).as_slice()); return; } @@ -1039,7 +1039,7 @@ fn compare_impl_method(tcx: &ty::ctxt, impl_m_span, format!("method `{}` has an incompatible type for trait: {}", token::get_ident(trait_m.ident), - ty::type_err_to_str(tcx, terr)).as_slice()); + ty::type_err_to_string(tcx, terr)).as_slice()); ty::note_and_explain_type_err(tcx, terr); } } @@ -1107,7 +1107,7 @@ impl<'a> FnCtxt<'a> { #[inline] pub fn write_ty(&self, node_id: ast::NodeId, ty: ty::t) { debug!("write_ty({}, {}) in fcx {}", - node_id, ppaux::ty_to_str(self.tcx(), ty), self.tag()); + node_id, ppaux::ty_to_string(self.tcx(), ty), self.tag()); self.inh.node_types.borrow_mut().insert(node_id, ty); } @@ -1164,7 +1164,7 @@ impl<'a> FnCtxt<'a> { ast_ty_to_ty(self, self.infcx(), ast_t) } - pub fn pat_to_str(&self, pat: &ast::Pat) -> String { + pub fn pat_to_string(&self, pat: &ast::Pat) -> String { pat.repr(self.tcx()) } @@ -1184,7 +1184,7 @@ impl<'a> FnCtxt<'a> { None => { self.tcx().sess.bug( format!("no type for node {}: {} in fcx {}", - id, self.tcx().map.node_to_str(id), + id, self.tcx().map.node_to_string(id), self.tag()).as_slice()); } } @@ -1196,7 +1196,7 @@ impl<'a> FnCtxt<'a> { None => { self.tcx().sess.bug( format!("no method entry for node {}: {} in fcx {}", - id, self.tcx().map.node_to_str(id), + id, self.tcx().map.node_to_string(id), self.tag()).as_slice()); } } @@ -1593,7 +1593,7 @@ fn check_argument_types(fcx: &FnCtxt, }; debug!("check_argument_types: formal_tys={:?}", - formal_tys.iter().map(|t| fcx.infcx().ty_to_str(*t)).collect::>()); + formal_tys.iter().map(|t| fcx.infcx().ty_to_string(*t)).collect::>()); // Check the arguments. // We do this in a pretty awful way: first we typecheck any arguments @@ -2123,7 +2123,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, operation `{}` not \ supported for floating \ point SIMD vector `{}`", - ast_util::binop_to_str(op), + ast_util::binop_to_string(op), actual) }, lhs_t, @@ -2153,7 +2153,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, |actual| { format!("binary operation `{}` cannot be applied \ to type `{}`", - ast_util::binop_to_str(op), + ast_util::binop_to_string(op), actual) }, lhs_t, @@ -2170,7 +2170,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, operation `{}=` \ cannot be applied to \ type `{}`", - ast_util::binop_to_str(op), + ast_util::binop_to_string(op), actual) }, lhs_t, @@ -2219,7 +2219,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, trait_did, [lhs_expr, rhs], DontAutoderefReceiver, || { fcx.type_error_message(ex.span, |actual| { format!("binary operation `{}` cannot be applied to type `{}`", - ast_util::binop_to_str(op), + ast_util::binop_to_string(op), actual) }, lhs_resolved_t, None) }) @@ -2329,7 +2329,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, expected_sig); let fty_sig = fn_ty.sig.clone(); let fty = ty::mk_closure(tcx, fn_ty); - debug!("check_expr_fn fty={}", fcx.infcx().ty_to_str(fty)); + debug!("check_expr_fn fty={}", fcx.infcx().ty_to_string(fty)); fcx.write_ty(expr.id, fty); @@ -2363,7 +2363,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, autoderef(fcx, expr.span, expr_t, Some(base.id), lvalue_pref, |base_t, _| { match ty::get(base_t).sty { ty::ty_struct(base_id, ref substs) => { - debug!("struct named {}", ppaux::ty_to_str(tcx, base_t)); + debug!("struct named {}", ppaux::ty_to_string(tcx, base_t)); let fields = ty::lookup_struct_fields(tcx, base_id); lookup_field_ty(tcx, base_id, fields.as_slice(), field.node.name, &(*substs)) @@ -3009,8 +3009,8 @@ fn check_expr_with_unifier(fcx: &FnCtxt, let t_1 = fcx.to_ty(&**t); let t_e = fcx.expr_ty(&**e); - debug!("t_1={}", fcx.infcx().ty_to_str(t_1)); - debug!("t_e={}", fcx.infcx().ty_to_str(t_e)); + debug!("t_1={}", fcx.infcx().ty_to_string(t_1)); + debug!("t_e={}", fcx.infcx().ty_to_string(t_e)); if ty::type_is_error(t_e) { fcx.write_error(id); @@ -3031,13 +3031,13 @@ fn check_expr_with_unifier(fcx: &FnCtxt, fcx.type_error_message(expr.span, |actual| { format!("cast from nil: `{}` as `{}`", actual, - fcx.infcx().ty_to_str(t_1)) + fcx.infcx().ty_to_string(t_1)) }, t_e, None); } else if ty::type_is_nil(t_1) { fcx.type_error_message(expr.span, |actual| { format!("cast to nil: `{}` as `{}`", actual, - fcx.infcx().ty_to_str(t_1)) + fcx.infcx().ty_to_string(t_1)) }, t_e, None); } @@ -3054,7 +3054,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, format!("illegal cast; cast through an \ integer first: `{}` as `{}`", actual, - fcx.infcx().ty_to_str(t_1)) + fcx.infcx().ty_to_string(t_1)) }, t_e, None); } // casts from C-like enums are allowed @@ -3124,7 +3124,7 @@ fn check_expr_with_unifier(fcx: &FnCtxt, fcx.type_error_message(expr.span, |actual| { format!("non-scalar cast: `{}` as `{}`", actual, - fcx.infcx().ty_to_str(t_1)) + fcx.infcx().ty_to_string(t_1)) }, t_e, None); } } @@ -3258,11 +3258,11 @@ fn check_expr_with_unifier(fcx: &FnCtxt, } debug!("type of expr({}) {} is...", expr.id, - syntax::print::pprust::expr_to_str(expr)); + syntax::print::pprust::expr_to_string(expr)); debug!("... {}, expected is {}", - ppaux::ty_to_str(tcx, fcx.expr_ty(expr)), + ppaux::ty_to_string(tcx, fcx.expr_ty(expr)), match expected { - Some(t) => ppaux::ty_to_str(tcx, t), + Some(t) => ppaux::ty_to_string(tcx, t), _ => "empty".to_string() }); @@ -3541,7 +3541,7 @@ pub fn check_instantiable(tcx: &ty::ctxt, format!("this type cannot be instantiated without an \ instance of itself; consider using \ `Option<{}>`", - ppaux::ty_to_str(tcx, item_ty)).as_slice()); + ppaux::ty_to_string(tcx, item_ty)).as_slice()); false } else { true @@ -3602,7 +3602,7 @@ pub fn check_enum_variants_sized(ccx: &CrateCtxt, dynamically sized types may only \ appear as the final type in a \ variant", - ppaux::ty_to_str(ccx.tcx, + ppaux::ty_to_string(ccx.tcx, *t)).as_slice()); } } @@ -3667,7 +3667,7 @@ pub fn check_enum_variants(ccx: &CrateCtxt, match v.node.disr_expr { Some(e) => { - debug!("disr expr, checking {}", pprust::expr_to_str(&*e)); + debug!("disr expr, checking {}", pprust::expr_to_string(&*e)); let inh = blank_inherited_fields(ccx); let fcx = blank_fn_ctxt(ccx, &inh, rty, e.id); @@ -4261,7 +4261,7 @@ pub fn check_bounds_are_used(ccx: &CrateCtxt, tps: &OwnedSlice, ty: ty::t) { debug!("check_bounds_are_used(n_tps={}, ty={})", - tps.len(), ppaux::ty_to_str(ccx.tcx, ty)); + tps.len(), ppaux::ty_to_string(ccx.tcx, ty)); // make a vector of booleans initially false, set to true when used if tps.len() == 0u { return; } @@ -4579,7 +4579,7 @@ pub fn check_intrinsic_type(ccx: &CrateCtxt, it: &ast::ForeignItem) { fty, || { format!("intrinsic has wrong type: expected `{}`", - ppaux::ty_to_str(ccx.tcx, fty)) + ppaux::ty_to_string(ccx.tcx, fty)) }); } } diff --git a/src/librustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs index 4cd319af0d9d8..266233527d1c6 100644 --- a/src/librustc/middle/typeck/check/regionck.rs +++ b/src/librustc/middle/typeck/check/regionck.rs @@ -876,7 +876,7 @@ fn constrain_autoderefs(rcx: &mut Rcx, let r_deref_expr = ty::ReScope(deref_expr.id); for i in range(0u, derefs) { debug!("constrain_autoderefs(deref_expr=?, derefd_ty={}, derefs={:?}/{:?}", - rcx.fcx.infcx().ty_to_str(derefd_ty), + rcx.fcx.infcx().ty_to_string(derefd_ty), i, derefs); let method_call = MethodCall::autoderef(deref_expr.id, i); @@ -948,7 +948,7 @@ fn constrain_index(rcx: &mut Rcx, */ debug!("constrain_index(index_expr=?, indexed_ty={}", - rcx.fcx.infcx().ty_to_str(indexed_ty)); + rcx.fcx.infcx().ty_to_string(indexed_ty)); let r_index_expr = ty::ReScope(index_expr.id); match ty::get(indexed_ty).sty { @@ -984,7 +984,7 @@ fn constrain_regions_in_type_of_node( |method_call| rcx.resolve_method_type(method_call)); debug!("constrain_regions_in_type_of_node(\ ty={}, ty0={}, id={}, minimum_lifetime={:?})", - ty_to_str(tcx, ty), ty_to_str(tcx, ty0), + ty_to_string(tcx, ty), ty_to_string(tcx, ty0), id, minimum_lifetime); constrain_regions_in_type(rcx, minimum_lifetime, origin, ty); } @@ -1011,8 +1011,8 @@ fn constrain_regions_in_type( let tcx = rcx.fcx.ccx.tcx; debug!("constrain_regions_in_type(minimum_lifetime={}, ty={})", - region_to_str(tcx, "", false, minimum_lifetime), - ty_to_str(tcx, ty)); + region_to_string(tcx, "", false, minimum_lifetime), + ty_to_string(tcx, ty)); relate_nested_regions(tcx, Some(minimum_lifetime), ty, |r_sub, r_sup| { debug!("relate_nested_regions(r_sub={}, r_sup={})", @@ -1190,7 +1190,7 @@ fn link_region_from_node_type(rcx: &Rcx, let rptr_ty = rcx.resolve_node_type(id); if !ty::type_is_bot(rptr_ty) && !ty::type_is_error(rptr_ty) { let tcx = rcx.fcx.ccx.tcx; - debug!("rptr_ty={}", ty_to_str(tcx, rptr_ty)); + debug!("rptr_ty={}", ty_to_string(tcx, rptr_ty)); let r = ty::ty_region(tcx, span, rptr_ty); link_region(rcx, span, r, ty::BorrowKind::from_mutbl(mutbl), cmt_borrowed); diff --git a/src/librustc/middle/typeck/check/regionmanip.rs b/src/librustc/middle/typeck/check/regionmanip.rs index 146b42a00ffaf..53e26f8696f61 100644 --- a/src/librustc/middle/typeck/check/regionmanip.rs +++ b/src/librustc/middle/typeck/check/regionmanip.rs @@ -30,7 +30,7 @@ pub fn replace_late_bound_regions_in_fn_sig( let mut map = HashMap::new(); let fn_sig = { let mut f = ty_fold::RegionFolder::regions(tcx, |r| { - debug!("region r={}", r.to_str()); + debug!("region r={}", r.to_string()); match r { ty::ReLateBound(s, br) if s == fn_sig.binder_id => { *map.find_or_insert_with(br, |_| mapf(br)) @@ -153,7 +153,7 @@ pub fn relate_free_regions(tcx: &ty::ctxt, fn_sig: &ty::FnSig) { } for &t in all_tys.iter() { - debug!("relate_free_regions(t={})", ppaux::ty_to_str(tcx, t)); + debug!("relate_free_regions(t={})", ppaux::ty_to_string(tcx, t)); relate_nested_regions(tcx, None, t, |a, b| { match (&a, &b) { (&ty::ReFree(free_a), &ty::ReFree(free_b)) => { diff --git a/src/librustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs index 6ac6cdce8590d..806a82efff752 100644 --- a/src/librustc/middle/typeck/check/vtable.rs +++ b/src/librustc/middle/typeck/check/vtable.rs @@ -153,8 +153,8 @@ fn lookup_vtables_for_param(vcx: &VtableContext, vcx.tcx().sess.span_fatal(span, format!("failed to find an implementation of \ trait {} for {}", - vcx.infcx.trait_ref_to_str(&*trait_ref), - vcx.infcx.ty_to_str(ty)).as_slice()); + vcx.infcx.trait_ref_to_string(&*trait_ref), + vcx.infcx.ty_to_string(ty)).as_slice()); } } true @@ -204,9 +204,9 @@ fn relate_trait_refs(vcx: &VtableContext, let tcx = vcx.tcx(); tcx.sess.span_err(span, format!("expected {}, but found {} ({})", - ppaux::trait_ref_to_str(tcx, &r_exp_trait_ref), - ppaux::trait_ref_to_str(tcx, &r_act_trait_ref), - ty::type_err_to_str(tcx, err)).as_slice()); + ppaux::trait_ref_to_string(tcx, &r_exp_trait_ref), + ppaux::trait_ref_to_string(tcx, &r_act_trait_ref), + ty::type_err_to_string(tcx, err)).as_slice()); } } } @@ -386,8 +386,8 @@ fn search_for_vtable(vcx: &VtableContext, debug!("(checking vtable) num 2 relating trait \ ty {} to of_trait_ref {}", - vcx.infcx.trait_ref_to_str(&*trait_ref), - vcx.infcx.trait_ref_to_str(&*of_trait_ref)); + vcx.infcx.trait_ref_to_string(&*trait_ref), + vcx.infcx.trait_ref_to_string(&*of_trait_ref)); relate_trait_refs(vcx, span, of_trait_ref, trait_ref.clone()); @@ -486,7 +486,7 @@ fn fixup_ty(vcx: &VtableContext, tcx.sess.span_fatal(span, format!("cannot determine a type for this bounded type \ parameter: {}", - fixup_err_to_str(e)).as_slice()) + fixup_err_to_string(e)).as_slice()) } Err(_) => { None @@ -525,7 +525,7 @@ pub fn early_resolve_expr(ex: &ast::Expr, fcx: &FnCtxt, is_early: bool) { } debug!("vtable: early_resolve_expr() ex with id {:?} (early: {}): {}", - ex.id, is_early, expr_to_str(ex)); + ex.id, is_early, expr_to_string(ex)); let _indent = indenter(); let cx = fcx.ccx; @@ -655,7 +655,7 @@ pub fn early_resolve_expr(ex: &ast::Expr, fcx: &FnCtxt, is_early: bool) { let did = def.def_id(); let item_ty = ty::lookup_item_type(cx.tcx, did); debug!("early resolve expr: def {:?} {:?}, {:?}, {}", ex.id, did, def, - fcx.infcx().ty_to_str(item_ty.ty)); + fcx.infcx().ty_to_string(item_ty.ty)); debug!("early_resolve_expr: looking up vtables for type params {}", item_ty.generics.types.repr(fcx.tcx())); let vcx = fcx.vtable_context(); diff --git a/src/librustc/middle/typeck/check/writeback.rs b/src/librustc/middle/typeck/check/writeback.rs index 8e3e8e6091b2e..866ed6b313e15 100644 --- a/src/librustc/middle/typeck/check/writeback.rs +++ b/src/librustc/middle/typeck/check/writeback.rs @@ -159,7 +159,7 @@ impl<'cx> Visitor<()> for WritebackCx<'cx> { self.visit_node_id(ResolvingPattern(p.span), p.id); debug!("Type for pattern binding {} (id {}) resolved to {}", - pat_to_str(p), + pat_to_string(p), p.id, ty::node_id_to_type(self.tcx(), p.id).repr(self.tcx())); @@ -403,7 +403,7 @@ impl<'cx> Resolver<'cx> { span, format!("cannot determine a type for \ this expression: {}", - infer::fixup_err_to_str(e)).as_slice()) + infer::fixup_err_to_string(e)).as_slice()) } ResolvingLocal(span) => { @@ -411,7 +411,7 @@ impl<'cx> Resolver<'cx> { span, format!("cannot determine a type for \ this local variable: {}", - infer::fixup_err_to_str(e)).as_slice()) + infer::fixup_err_to_string(e)).as_slice()) } ResolvingPattern(span) => { @@ -419,7 +419,7 @@ impl<'cx> Resolver<'cx> { span, format!("cannot determine a type for \ this pattern binding: {}", - infer::fixup_err_to_str(e)).as_slice()) + infer::fixup_err_to_string(e)).as_slice()) } ResolvingUpvar(upvar_id) => { @@ -430,8 +430,8 @@ impl<'cx> Resolver<'cx> { captured variable `{}`: {}", ty::local_var_name_str( self.tcx, - upvar_id.var_id).get().to_str(), - infer::fixup_err_to_str(e)).as_slice()); + upvar_id.var_id).get().to_string(), + infer::fixup_err_to_string(e)).as_slice()); } ResolvingImplRes(span) => { diff --git a/src/librustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs index 55969b79b5241..885a7994950bc 100644 --- a/src/librustc/middle/typeck/collect.rs +++ b/src/librustc/middle/typeck/collect.rs @@ -665,7 +665,7 @@ pub fn instantiate_trait_ref(ccx: &CrateCtxt, ccx.tcx.sess.span_fatal( ast_trait_ref.path.span, format!("`{}` is not a trait", - path_to_str(&ast_trait_ref.path)).as_slice()); + path_to_string(&ast_trait_ref.path)).as_slice()); } } } @@ -844,7 +844,7 @@ pub fn ty_of_item(ccx: &CrateCtxt, it: &ast::Item) debug!("type of {} (id {}) is {}", token::get_ident(it.ident), it.id, - ppaux::ty_to_str(tcx, tpt.ty)); + ppaux::ty_to_string(tcx, tpt.ty)); ccx.tcx.tcache.borrow_mut().insert(local_def(it.id), tpt.clone()); return tpt; @@ -1144,7 +1144,7 @@ fn ty_generics(ccx: &CrateCtxt, format!("incompatible bounds on type parameter {}, \ bound {} does not allow unsized type", token::get_ident(ident), - ppaux::trait_ref_to_str(tcx, + ppaux::trait_ref_to_string(tcx, &*trait_ref)).as_slice()); } true diff --git a/src/librustc/middle/typeck/infer/error_reporting.rs b/src/librustc/middle/typeck/infer/error_reporting.rs index 40d9543e669df..489e344ef4dea 100644 --- a/src/librustc/middle/typeck/infer/error_reporting.rs +++ b/src/librustc/middle/typeck/infer/error_reporting.rs @@ -358,7 +358,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> { format!("{}: {} ({})", message_root_str, expected_found_str, - ty::type_err_to_str(self.tcx, terr)).as_slice()); + ty::type_err_to_string(self.tcx, terr)).as_slice()); match trace.origin { infer::MatchExpressionArm(_, arm_span) => @@ -442,7 +442,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> { ty::local_var_name_str(self.tcx, upvar_id.var_id) .get() - .to_str()).as_slice()); + .to_string()).as_slice()); note_and_explain_region( self.tcx, "...the borrowed pointer is valid for ", @@ -454,7 +454,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> { ty::local_var_name_str(self.tcx, upvar_id.var_id) .get() - .to_str()).as_slice(), + .to_string()).as_slice(), sup, ""); } @@ -500,7 +500,7 @@ impl<'a> ErrorReporting for InferCtxt<'a> { outlive the enclosing closure", ty::local_var_name_str(self.tcx, id).get() - .to_str()).as_slice()); + .to_string()).as_slice()); note_and_explain_region( self.tcx, "captured variable is valid for ", @@ -1046,7 +1046,7 @@ impl<'a> Rebuilder<'a> { .sess .fatal(format!( "unbound path {}", - pprust::path_to_str(path)).as_slice()) + pprust::path_to_string(path)).as_slice()) } Some(&d) => d }; @@ -1231,7 +1231,7 @@ impl<'a> ErrorReportingHelpers for InferCtxt<'a> { opt_explicit_self: Option, generics: &ast::Generics, span: codemap::Span) { - let suggested_fn = pprust::fun_to_str(decl, fn_style, ident, + let suggested_fn = pprust::fun_to_string(decl, fn_style, ident, opt_explicit_self, generics); let msg = format!("consider using an explicit lifetime \ parameter as shown: {}", suggested_fn); @@ -1249,11 +1249,11 @@ impl<'a> ErrorReportingHelpers for InferCtxt<'a> { infer::Coercion(_) => " for automatic coercion".to_string(), infer::LateBoundRegion(_, br) => { format!(" for {}in function call", - bound_region_to_str(self.tcx, "lifetime parameter ", true, br)) + bound_region_to_string(self.tcx, "lifetime parameter ", true, br)) } infer::BoundRegionInFnType(_, br) => { format!(" for {}in function type", - bound_region_to_str(self.tcx, "lifetime parameter ", true, br)) + bound_region_to_string(self.tcx, "lifetime parameter ", true, br)) } infer::EarlyBoundRegion(_, name) => { format!(" for lifetime parameter `{}", @@ -1265,7 +1265,7 @@ impl<'a> ErrorReportingHelpers for InferCtxt<'a> { } infer::UpvarRegion(ref upvar_id, _) => { format!(" for capture of `{}` by closure", - ty::local_var_name_str(self.tcx, upvar_id.var_id).get().to_str()) + ty::local_var_name_str(self.tcx, upvar_id.var_id).get().to_string()) } }; @@ -1334,7 +1334,7 @@ impl<'a> ErrorReportingHelpers for InferCtxt<'a> { "...so that closure can access `{}`", ty::local_var_name_str(self.tcx, upvar_id.var_id) .get() - .to_str()).as_slice()) + .to_string()).as_slice()) } infer::InfStackClosure(span) => { self.tcx.sess.span_note( @@ -1359,7 +1359,7 @@ impl<'a> ErrorReportingHelpers for InferCtxt<'a> { does not outlive the enclosing closure", ty::local_var_name_str( self.tcx, - id).get().to_str()).as_slice()); + id).get().to_string()).as_slice()); } infer::IndexSlice(span) => { self.tcx.sess.span_note( @@ -1508,7 +1508,7 @@ impl LifeGiver { let mut lifetime; loop { let mut s = String::from_str("'"); - s.push_str(num_to_str(self.counter.get()).as_slice()); + s.push_str(num_to_string(self.counter.get()).as_slice()); if !self.taken.contains(&s) { lifetime = name_to_dummy_lifetime( token::str_to_ident(s.as_slice()).name); @@ -1521,7 +1521,7 @@ impl LifeGiver { return lifetime; // 0 .. 25 generates a .. z, 26 .. 51 generates aa .. zz, and so on - fn num_to_str(counter: uint) -> String { + fn num_to_string(counter: uint) -> String { let mut s = String::new(); let (n, r) = (counter/26 + 1, counter % 26); let letter: char = from_u32((r+97) as u32).unwrap(); diff --git a/src/librustc/middle/typeck/infer/glb.rs b/src/librustc/middle/typeck/infer/glb.rs index 18cfd2595139f..8cd166323776f 100644 --- a/src/librustc/middle/typeck/infer/glb.rs +++ b/src/librustc/middle/typeck/infer/glb.rs @@ -49,8 +49,8 @@ impl<'f> Combine for Glb<'f> { debug!("{}.mts({}, {})", self.tag(), - mt_to_str(tcx, a), - mt_to_str(tcx, b)); + mt_to_string(tcx, a), + mt_to_string(tcx, b)); match (a.mutbl, b.mutbl) { // If one side or both is mut, then the GLB must use diff --git a/src/librustc/middle/typeck/infer/lattice.rs b/src/librustc/middle/typeck/infer/lattice.rs index 6455344cb1351..d1417bd31f03f 100644 --- a/src/librustc/middle/typeck/infer/lattice.rs +++ b/src/librustc/middle/typeck/infer/lattice.rs @@ -72,19 +72,19 @@ impl LatticeValue for ty::t { pub trait CombineFieldsLatticeMethods { fn var_sub_var>>(&self, + V:Clone + PartialEq + ToString + Vid + UnifyVid>>(&self, a_id: V, b_id: V) -> ures; /// make variable a subtype of T fn var_sub_t>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( &self, a_id: V, b: T) -> ures; fn t_sub_var>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( &self, a: T, b_id: V) @@ -96,7 +96,7 @@ pub trait CombineFieldsLatticeMethods { lattice_op: LatticeOp) -> cres>; fn set_var_to_merged_bounds>>( + V:Clone+PartialEq+ToString+Vid+UnifyVid>>( &self, v_id: V, a: &Bounds, @@ -112,7 +112,7 @@ pub trait CombineFieldsLatticeMethods { impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { fn var_sub_var>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( &self, a_id: V, b_id: V) @@ -132,8 +132,8 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { let b_bounds = node_b.possible_types.clone(); debug!("vars({}={} <: {}={})", - a_id.to_str(), a_bounds.inf_str(self.infcx), - b_id.to_str(), b_bounds.inf_str(self.infcx)); + a_id.to_string(), a_bounds.inf_str(self.infcx), + b_id.to_string(), b_bounds.inf_str(self.infcx)); if a_id == b_id { return uok(); } @@ -165,7 +165,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { /// make variable a subtype of T fn var_sub_t>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( &self, a_id: V, b: T) @@ -180,7 +180,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { let b_bounds = &Bounds { lb: None, ub: Some(b.clone()) }; debug!("var_sub_t({}={} <: {})", - a_id.to_str(), + a_id.to_string(), a_bounds.inf_str(self.infcx), b.inf_str(self.infcx)); @@ -189,7 +189,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { } fn t_sub_var>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( &self, a: T, b_id: V) @@ -205,7 +205,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { debug!("t_sub_var({} <: {}={})", a.inf_str(self.infcx), - b_id.to_str(), + b_id.to_string(), b_bounds.inf_str(self.infcx)); self.set_var_to_merged_bounds( @@ -238,7 +238,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { } fn set_var_to_merged_bounds>>( + V:Clone+PartialEq+ToString+Vid+UnifyVid>>( &self, v_id: V, a: &Bounds, @@ -272,7 +272,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { // B debug!("merge({},{},{})", - v_id.to_str(), + v_id.to_string(), a.inf_str(self.infcx), b.inf_str(self.infcx)); let _indent = indenter(); @@ -289,7 +289,7 @@ impl<'f> CombineFieldsLatticeMethods for CombineFields<'f> { let lb = if_ok!(self.merge_bnd(&a.lb, &b.lb, LatticeValue::lub)); let bounds = Bounds { lb: lb, ub: ub }; debug!("merge({}): bounds={}", - v_id.to_str(), + v_id.to_string(), bounds.inf_str(self.infcx)); // the new bounds must themselves @@ -432,7 +432,7 @@ pub enum LatticeVarResult { * return. */ pub fn lattice_vars>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( this: &L, // defines whether we want LUB or GLB a_vid: V, // first variable b_vid: V, // second variable @@ -447,8 +447,8 @@ pub fn lattice_vars>>( + V:Clone + PartialEq + ToString + Vid + UnifyVid>>( this: &L, a_id: V, b: &T, @@ -493,7 +493,7 @@ pub fn lattice_var_and_t Combine for Lub<'f> { debug!("{}.mts({}, {})", self.tag(), - mt_to_str(tcx, a), - mt_to_str(tcx, b)); + mt_to_string(tcx, a), + mt_to_string(tcx, b)); if a.mutbl != b.mutbl { return Err(ty::terr_mutability) diff --git a/src/librustc/middle/typeck/infer/mod.rs b/src/librustc/middle/typeck/infer/mod.rs index 7a7dbaa549a5c..52c184ad9e696 100644 --- a/src/librustc/middle/typeck/infer/mod.rs +++ b/src/librustc/middle/typeck/infer/mod.rs @@ -245,7 +245,7 @@ pub enum fixup_err { region_var_bound_by_region_var(RegionVid, RegionVid) } -pub fn fixup_err_to_str(f: fixup_err) -> String { +pub fn fixup_err_to_string(f: fixup_err) -> String { match f { unresolved_int_ty(_) => "unconstrained integral type".to_string(), unresolved_ty(_) => "unconstrained type".to_string(), @@ -664,19 +664,19 @@ impl<'a> InferCtxt<'a> { self.report_region_errors(&errors); // see error_reporting.rs } - pub fn ty_to_str(&self, t: ty::t) -> String { - ty_to_str(self.tcx, + pub fn ty_to_string(&self, t: ty::t) -> String { + ty_to_string(self.tcx, self.resolve_type_vars_if_possible(t)) } - pub fn tys_to_str(&self, ts: &[ty::t]) -> String { - let tstrs: Vec = ts.iter().map(|t| self.ty_to_str(*t)).collect(); + pub fn tys_to_string(&self, ts: &[ty::t]) -> String { + let tstrs: Vec = ts.iter().map(|t| self.ty_to_string(*t)).collect(); format!("({})", tstrs.connect(", ")) } - pub fn trait_ref_to_str(&self, t: &ty::TraitRef) -> String { + pub fn trait_ref_to_string(&self, t: &ty::TraitRef) -> String { let t = self.resolve_type_vars_in_trait_ref_if_possible(t); - trait_ref_to_str(self.tcx, &t) + trait_ref_to_string(self.tcx, &t) } pub fn resolve_type_vars_if_possible(&self, typ: ty::t) -> ty::t { @@ -707,8 +707,8 @@ impl<'a> InferCtxt<'a> { self.tcx.sess.bug( format!("resolve_type_vars_if_possible() yielded {} \ when supplied with {}", - self.ty_to_str(dummy0), - self.ty_to_str(dummy1)).as_slice()); + self.ty_to_string(dummy0), + self.ty_to_string(dummy1)).as_slice()); } } } @@ -743,7 +743,7 @@ impl<'a> InferCtxt<'a> { debug!("hi! expected_ty = {:?}, actual_ty = {}", expected_ty, actual_ty); let error_str = err.map_or("".to_string(), |t_err| { - format!(" ({})", ty::type_err_to_str(self.tcx, t_err)) + format!(" ({})", ty::type_err_to_string(self.tcx, t_err)) }); let resolved_expected = expected_ty.map(|e_ty| { self.resolve_type_vars_if_possible(e_ty) @@ -761,7 +761,7 @@ impl<'a> InferCtxt<'a> { Some(e) => { self.tcx.sess.span_err(sp, format!("{}{}", - mk_msg(Some(self.ty_to_str(e)), actual_ty), + mk_msg(Some(self.ty_to_string(e)), actual_ty), error_str).as_slice()); } } @@ -783,7 +783,7 @@ impl<'a> InferCtxt<'a> { return; } - self.type_error_message_str(sp, |_e, a| { mk_msg(a) }, self.ty_to_str(actual_ty), err); + self.type_error_message_str(sp, |_e, a| { mk_msg(a) }, self.ty_to_string(actual_ty), err); } pub fn report_mismatched_types(&self, @@ -800,7 +800,7 @@ impl<'a> InferCtxt<'a> { // if I leave out : String, it infers &str and complains |actual: String| { format!("mismatched types: expected `{}` but found `{}`", - self.ty_to_str(resolved_expected), + self.ty_to_string(resolved_expected), actual) } } @@ -819,7 +819,7 @@ impl<'a> InferCtxt<'a> { let rvar = self.next_region_var( BoundRegionInFnType(trace.origin.span(), br)); debug!("Bound region {} maps to {:?}", - bound_region_to_str(self.tcx, "", false, br), + bound_region_to_string(self.tcx, "", false, br), rvar); rvar }); diff --git a/src/librustc/middle/typeck/infer/resolve.rs b/src/librustc/middle/typeck/infer/resolve.rs index 9df610dc7bc2a..ac7e088d92c50 100644 --- a/src/librustc/middle/typeck/infer/resolve.rs +++ b/src/librustc/middle/typeck/infer/resolve.rs @@ -118,7 +118,7 @@ impl<'a> ResolveState<'a> { self.err = None; debug!("Resolving {} (modes={:x})", - ty_to_str(self.infcx.tcx, typ), + ty_to_string(self.infcx.tcx, typ), self.modes); // n.b. This is a hokey mess because the current fold doesn't @@ -130,8 +130,8 @@ impl<'a> ResolveState<'a> { match self.err { None => { debug!("Resolved to {} + {} (modes={:x})", - ty_to_str(self.infcx.tcx, rty), - ty_to_str(self.infcx.tcx, rty), + ty_to_string(self.infcx.tcx, rty), + ty_to_string(self.infcx.tcx, rty), self.modes); return Ok(rty); } diff --git a/src/librustc/middle/typeck/infer/sub.rs b/src/librustc/middle/typeck/infer/sub.rs index a543cf18d565a..2c63ea62b2c54 100644 --- a/src/librustc/middle/typeck/infer/sub.rs +++ b/src/librustc/middle/typeck/infer/sub.rs @@ -177,7 +177,7 @@ impl<'f> Combine for Sub<'f> { replace_late_bound_regions_in_fn_sig(self.get_ref().infcx.tcx, b, |br| { let skol = self.get_ref().infcx.region_vars.new_skolemized(br); debug!("Bound region {} skolemized to {:?}", - bound_region_to_str(self.get_ref().infcx.tcx, "", false, br), + bound_region_to_string(self.get_ref().infcx.tcx, "", false, br), skol); skol }) diff --git a/src/librustc/middle/typeck/infer/test.rs b/src/librustc/middle/typeck/infer/test.rs index e4636e1c7c6d7..7970ac8f7315f 100644 --- a/src/librustc/middle/typeck/infer/test.rs +++ b/src/librustc/middle/typeck/infer/test.rs @@ -60,7 +60,7 @@ fn setup_env(test_name: &str, source_string: &str) -> Env { let parse_sess = parse::new_parse_sess(None); let krate = parse_crate_from_source_str( - test_name.to_str(), @source_string.to_str(), + test_name.to_string(), @source_string.to_string(), cfg, parse_sess); let tcx = ty::mk_ctxt(sess, dm, amap, freevars, region_map, @@ -151,16 +151,16 @@ impl Env { pub fn assert_subtype(&self, a: ty::t, b: ty::t) { if !self.is_subtype(a, b) { fail!("%s is not a subtype of %s, but it should be", - self.ty_to_str(a), - self.ty_to_str(b)); + self.ty_to_string(a), + self.ty_to_string(b)); } } pub fn assert_not_subtype(&self, a: ty::t, b: ty::t) { if self.is_subtype(a, b) { fail!("%s is a subtype of %s, but it shouldn't be", - self.ty_to_str(a), - self.ty_to_str(b)); + self.ty_to_string(a), + self.ty_to_string(b)); } } @@ -174,8 +174,8 @@ impl Env { self.assert_subtype(b, a); } - pub fn ty_to_str(&self, a: ty::t) -> String { - ty_to_str(self.tcx, a) + pub fn ty_to_string(&self, a: ty::t) -> String { + ty_to_string(self.tcx, a) } pub fn t_fn(&self, input_tys: &[ty::t], output_ty: ty::t) -> ty::t { @@ -257,9 +257,9 @@ impl Env { /// Checks that `GLB(t1,t2) == t_glb` pub fn check_glb(&self, t1: ty::t, t2: ty::t, t_glb: ty::t) { debug!("check_glb(t1=%s, t2=%s, t_glb=%s)", - self.ty_to_str(t1), - self.ty_to_str(t2), - self.ty_to_str(t_glb)); + self.ty_to_string(t1), + self.ty_to_string(t2), + self.ty_to_string(t_glb)); match self.glb().tys(t1, t2) { Err(e) => { fail!("unexpected error computing LUB: %?", e) @@ -281,7 +281,7 @@ impl Env { match self.lub().tys(t1, t2) { Err(_) => {} Ok(t) => { - fail!("unexpected success computing LUB: %?", self.ty_to_str(t)) + fail!("unexpected success computing LUB: %?", self.ty_to_string(t)) } } } @@ -291,7 +291,7 @@ impl Env { match self.glb().tys(t1, t2) { Err(_) => {} Ok(t) => { - fail!("unexpected success computing GLB: %?", self.ty_to_str(t)) + fail!("unexpected success computing GLB: %?", self.ty_to_string(t)) } } } diff --git a/src/librustc/middle/typeck/infer/to_str.rs b/src/librustc/middle/typeck/infer/to_str.rs index 097c5dcfedaa3..ff29b4f73ccb5 100644 --- a/src/librustc/middle/typeck/infer/to_str.rs +++ b/src/librustc/middle/typeck/infer/to_str.rs @@ -25,7 +25,7 @@ pub trait InferStr { impl InferStr for ty::t { fn inf_str(&self, cx: &InferCtxt) -> String { - ty_to_str(cx.tcx, *self) + ty_to_string(cx.tcx, *self) } } @@ -41,7 +41,7 @@ impl InferStr for FnSig { impl InferStr for ty::mt { fn inf_str(&self, cx: &InferCtxt) -> String { - mt_to_str(cx.tcx, self) + mt_to_string(cx.tcx, self) } } @@ -66,10 +66,10 @@ impl InferStr for Bounds { } } -impl InferStr for VarValue { +impl InferStr for VarValue { fn inf_str(&self, cx: &InferCtxt) -> String { match *self { - Redirect(ref vid) => format!("Redirect({})", vid.to_str()), + Redirect(ref vid) => format!("Redirect({})", vid.to_string()), Root(ref pt, rk) => { format!("Root({}, {})", pt.inf_str(cx), rk) } @@ -79,18 +79,18 @@ impl InferStr for VarValue { impl InferStr for IntVarValue { fn inf_str(&self, _cx: &InferCtxt) -> String { - self.to_str() + self.to_string() } } impl InferStr for ast::FloatTy { fn inf_str(&self, _cx: &InferCtxt) -> String { - self.to_str() + self.to_string() } } impl InferStr for ty::TraitRef { fn inf_str(&self, cx: &InferCtxt) -> String { - trait_ref_to_str(cx.tcx, self) + trait_ref_to_string(cx.tcx, self) } } diff --git a/src/librustc/middle/typeck/infer/unify.rs b/src/librustc/middle/typeck/infer/unify.rs index 78c841afa609b..9a042ebebf424 100644 --- a/src/librustc/middle/typeck/infer/unify.rs +++ b/src/librustc/middle/typeck/infer/unify.rs @@ -57,12 +57,12 @@ pub trait UnifyInferCtxtMethods { vid: V) -> Node; fn set>( + V:Clone + Vid + ToString + UnifyVid>( &self, vid: V, new_v: VarValue); fn unify>( + V:Clone + Vid + ToString + UnifyVid>( &self, node_a: &Node, node_b: &Node) @@ -117,7 +117,7 @@ impl<'a> UnifyInferCtxtMethods for InferCtxt<'a> { } fn set>( + V:Clone + Vid + ToString + UnifyVid>( &self, vid: V, new_v: VarValue) { @@ -127,7 +127,7 @@ impl<'a> UnifyInferCtxtMethods for InferCtxt<'a> { */ debug!("Updating variable {} to {}", - vid.to_str(), new_v.inf_str(self)); + vid.to_string(), new_v.inf_str(self)); let vb = UnifyVid::appropriate_vals_and_bindings(self); let mut vb = vb.borrow_mut(); @@ -137,7 +137,7 @@ impl<'a> UnifyInferCtxtMethods for InferCtxt<'a> { } fn unify>( + V:Clone + Vid + ToString + UnifyVid>( &self, node_a: &Node, node_b: &Node) @@ -192,14 +192,14 @@ pub fn mk_err(a_is_expected: bool, pub trait InferCtxtMethods { fn simple_vars>>( + V:Clone + PartialEq + Vid + ToString + UnifyVid>>( &self, a_is_expected: bool, a_id: V, b_id: V) -> ures; fn simple_var_t>>( + V:Clone + PartialEq + Vid + ToString + UnifyVid>>( &self, a_is_expected: bool, a_id: V, @@ -209,7 +209,7 @@ pub trait InferCtxtMethods { impl<'a> InferCtxtMethods for InferCtxt<'a> { fn simple_vars>>( + V:Clone + PartialEq + Vid + ToString + UnifyVid>>( &self, a_is_expected: bool, a_id: V, @@ -249,7 +249,7 @@ impl<'a> InferCtxtMethods for InferCtxt<'a> { } fn simple_var_t>>( + V:Clone + PartialEq + Vid + ToString + UnifyVid>>( &self, a_is_expected: bool, a_id: V, diff --git a/src/librustc/middle/typeck/mod.rs b/src/librustc/middle/typeck/mod.rs index bc2768ce214eb..00b4f040b63d8 100644 --- a/src/librustc/middle/typeck/mod.rs +++ b/src/librustc/middle/typeck/mod.rs @@ -271,7 +271,7 @@ pub struct CrateCtxt<'a> { // Functions that write types into the node type table pub fn write_ty_to_tcx(tcx: &ty::ctxt, node_id: ast::NodeId, ty: ty::t) { - debug!("write_ty_to_tcx({}, {})", node_id, ppaux::ty_to_str(tcx, ty)); + debug!("write_ty_to_tcx({}, {})", node_id, ppaux::ty_to_string(tcx, ty)); assert!(!ty::type_needs_infer(ty)); tcx.node_types.borrow_mut().insert(node_id as uint, ty); } @@ -334,7 +334,7 @@ pub fn require_same_types(tcx: &ty::ctxt, tcx.sess.span_err(span, format!("{}: {}", msg(), - ty::type_err_to_str(tcx, + ty::type_err_to_string(tcx, terr)).as_slice()); ty::note_and_explain_type_err(tcx, terr); false @@ -378,14 +378,14 @@ fn check_main_fn_ty(ccx: &CrateCtxt, require_same_types(tcx, None, false, main_span, main_t, se_ty, || { format!("main function expects type: `{}`", - ppaux::ty_to_str(ccx.tcx, se_ty)) + ppaux::ty_to_string(ccx.tcx, se_ty)) }); } _ => { tcx.sess.span_bug(main_span, format!("main has a non-function type: found \ `{}`", - ppaux::ty_to_str(tcx, + ppaux::ty_to_string(tcx, main_t)).as_slice()); } } @@ -431,7 +431,7 @@ fn check_start_fn_ty(ccx: &CrateCtxt, require_same_types(tcx, None, false, start_span, start_t, se_ty, || { format!("start function expects type: `{}`", - ppaux::ty_to_str(ccx.tcx, se_ty)) + ppaux::ty_to_string(ccx.tcx, se_ty)) }); } @@ -439,7 +439,7 @@ fn check_start_fn_ty(ccx: &CrateCtxt, tcx.sess.span_bug(start_span, format!("start has a non-function type: found \ `{}`", - ppaux::ty_to_str(tcx, + ppaux::ty_to_string(tcx, start_t)).as_slice()); } } diff --git a/src/librustc/middle/typeck/variance.rs b/src/librustc/middle/typeck/variance.rs index 3731990e61faa..b3b9cb24f256d 100644 --- a/src/librustc/middle/typeck/variance.rs +++ b/src/librustc/middle/typeck/variance.rs @@ -547,7 +547,7 @@ impl<'a> ConstraintContext<'a> { None => { self.tcx().sess.bug(format!( "no inferred index entry for {}", - self.tcx().map.node_to_str(param_id)).as_slice()); + self.tcx().map.node_to_string(param_id)).as_slice()); } } } @@ -588,8 +588,8 @@ impl<'a> ConstraintContext<'a> { let is_inferred; macro_rules! cannot_happen { () => { { fail!("invalid parent: {:s} for {:s}", - tcx.map.node_to_str(parent_id), - tcx.map.node_to_str(param_id)); + tcx.map.node_to_string(parent_id), + tcx.map.node_to_string(param_id)); } } } match parent { @@ -658,7 +658,7 @@ impl<'a> ConstraintContext<'a> { InferredIndex(index): InferredIndex, variance: VarianceTermPtr<'a>) { debug!("add_constraint(index={}, variance={})", - index, variance.to_str()); + index, variance.to_string()); self.constraints.push(Constraint { inferred: InferredIndex(index), variance: variance }); } @@ -975,7 +975,7 @@ impl<'a> SolveContext<'a> { .param_id, old_value, new_value, - term.to_str()); + term.to_string()); *self.solutions.get_mut(inferred) = new_value; changed = true; diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 6e9ee92c0a35e..528f3540907dc 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -102,7 +102,7 @@ pub fn explain_region_and_span(cx: &ctxt, region: ty::Region) BrFresh(_) => "an anonymous lifetime defined on".to_string(), _ => { format!("the lifetime {} as defined on", - bound_region_ptr_to_str(cx, fr.bound_region)) + bound_region_ptr_to_string(cx, fr.bound_region)) } }; @@ -142,11 +142,11 @@ pub fn explain_region_and_span(cx: &ctxt, region: ty::Region) } } -pub fn bound_region_ptr_to_str(cx: &ctxt, br: BoundRegion) -> String { - bound_region_to_str(cx, "", false, br) +pub fn bound_region_ptr_to_string(cx: &ctxt, br: BoundRegion) -> String { + bound_region_to_string(cx, "", false, br) } -pub fn bound_region_to_str(cx: &ctxt, +pub fn bound_region_to_string(cx: &ctxt, prefix: &str, space: bool, br: BoundRegion) -> String { let space_str = if space { " " } else { "" }; @@ -167,11 +167,11 @@ pub fn bound_region_to_str(cx: &ctxt, // In general, if you are giving a region error message, // you should use `explain_region()` or, better yet, // `note_and_explain_region()` -pub fn region_ptr_to_str(cx: &ctxt, region: Region) -> String { - region_to_str(cx, "&", true, region) +pub fn region_ptr_to_string(cx: &ctxt, region: Region) -> String { + region_to_string(cx, "&", true, region) } -pub fn region_to_str(cx: &ctxt, prefix: &str, space: bool, region: Region) -> String { +pub fn region_to_string(cx: &ctxt, prefix: &str, space: bool, region: Region) -> String { let space_str = if space { " " } else { "" }; if cx.sess.verbose() { @@ -187,10 +187,10 @@ pub fn region_to_str(cx: &ctxt, prefix: &str, space: bool, region: Region) -> St ty::ReEarlyBound(_, _, _, name) => { token::get_name(name).get().to_string() } - ty::ReLateBound(_, br) => bound_region_to_str(cx, prefix, space, br), - ty::ReFree(ref fr) => bound_region_to_str(cx, prefix, space, fr.bound_region), + ty::ReLateBound(_, br) => bound_region_to_string(cx, prefix, space, br), + ty::ReFree(ref fr) => bound_region_to_string(cx, prefix, space, fr.bound_region), ty::ReInfer(ReSkolemized(_, br)) => { - bound_region_to_str(cx, prefix, space, br) + bound_region_to_string(cx, prefix, space, br) } ty::ReInfer(ReVar(_)) => prefix.to_string(), ty::ReStatic => format!("{}'static{}", prefix, space_str), @@ -198,22 +198,22 @@ pub fn region_to_str(cx: &ctxt, prefix: &str, space: bool, region: Region) -> St } } -pub fn mutability_to_str(m: ast::Mutability) -> String { +pub fn mutability_to_string(m: ast::Mutability) -> String { match m { ast::MutMutable => "mut ".to_string(), ast::MutImmutable => "".to_string(), } } -pub fn mt_to_str(cx: &ctxt, m: &mt) -> String { - format!("{}{}", mutability_to_str(m.mutbl), ty_to_str(cx, m.ty)) +pub fn mt_to_string(cx: &ctxt, m: &mt) -> String { + format!("{}{}", mutability_to_string(m.mutbl), ty_to_string(cx, m.ty)) } -pub fn trait_store_to_str(cx: &ctxt, s: ty::TraitStore) -> String { +pub fn trait_store_to_string(cx: &ctxt, s: ty::TraitStore) -> String { match s { ty::UniqTraitStore => "Box ".to_string(), ty::RegionTraitStore(r, m) => { - format!("{}{}", region_ptr_to_str(cx, r), mutability_to_str(m)) + format!("{}{}", region_ptr_to_string(cx, r), mutability_to_string(m)) } } } @@ -223,20 +223,20 @@ pub fn vec_map_to_str(ts: &[T], f: |t: &T| -> String) -> String { format!("[{}]", tstrs.connect(", ")) } -pub fn fn_sig_to_str(cx: &ctxt, typ: &ty::FnSig) -> String { +pub fn fn_sig_to_string(cx: &ctxt, typ: &ty::FnSig) -> String { format!("fn{}{} -> {}", typ.binder_id, typ.inputs.repr(cx), typ.output.repr(cx)) } -pub fn trait_ref_to_str(cx: &ctxt, trait_ref: &ty::TraitRef) -> String { +pub fn trait_ref_to_string(cx: &ctxt, trait_ref: &ty::TraitRef) -> String { trait_ref.user_string(cx).to_string() } -pub fn ty_to_str(cx: &ctxt, typ: t) -> String { - fn fn_input_to_str(cx: &ctxt, input: ty::t) -> String { - ty_to_str(cx, input).to_string() +pub fn ty_to_string(cx: &ctxt, typ: t) -> String { + fn fn_input_to_string(cx: &ctxt, input: ty::t) -> String { + ty_to_string(cx, input).to_string() } - fn bare_fn_to_str(cx: &ctxt, + fn bare_fn_to_string(cx: &ctxt, fn_style: ast::FnStyle, abi: abi::Abi, ident: Option, @@ -246,13 +246,13 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { match fn_style { ast::NormalFn => {} _ => { - s.push_str(fn_style.to_str().as_slice()); + s.push_str(fn_style.to_string().as_slice()); s.push_char(' '); } }; if abi != abi::Rust { - s.push_str(format!("extern {} ", abi.to_str()).as_slice()); + s.push_str(format!("extern {} ", abi.to_string()).as_slice()); }; s.push_str("fn"); @@ -265,25 +265,25 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { _ => { } } - push_sig_to_str(cx, &mut s, '(', ')', sig); + push_sig_to_string(cx, &mut s, '(', ')', sig); s } - fn closure_to_str(cx: &ctxt, cty: &ty::ClosureTy) -> String { + fn closure_to_string(cx: &ctxt, cty: &ty::ClosureTy) -> String { let mut s = String::new(); match cty.store { ty::UniqTraitStore => {} ty::RegionTraitStore(region, _) => { - s.push_str(region_to_str(cx, "", true, region).as_slice()); + s.push_str(region_to_string(cx, "", true, region).as_slice()); } } match cty.fn_style { ast::NormalFn => {} _ => { - s.push_str(cty.fn_style.to_str().as_slice()); + s.push_str(cty.fn_style.to_string().as_slice()); s.push_char(' '); } }; @@ -292,14 +292,14 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { ty::UniqTraitStore => { assert_eq!(cty.onceness, ast::Once); s.push_str("proc"); - push_sig_to_str(cx, &mut s, '(', ')', &cty.sig); + push_sig_to_string(cx, &mut s, '(', ')', &cty.sig); } ty::RegionTraitStore(..) => { match cty.onceness { ast::Many => {} ast::Once => s.push_str("once ") } - push_sig_to_str(cx, &mut s, '|', '|', &cty.sig); + push_sig_to_string(cx, &mut s, '|', '|', &cty.sig); } } @@ -311,13 +311,13 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { s } - fn push_sig_to_str(cx: &ctxt, + fn push_sig_to_string(cx: &ctxt, s: &mut String, bra: char, ket: char, sig: &ty::FnSig) { s.push_char(bra); - let strs: Vec = sig.inputs.iter().map(|a| fn_input_to_str(cx, *a)).collect(); + let strs: Vec = sig.inputs.iter().map(|a| fn_input_to_string(cx, *a)).collect(); s.push_str(strs.connect(", ").as_slice()); if sig.variadic { s.push_str(", ..."); @@ -329,7 +329,7 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { if ty::type_is_bot(sig.output) { s.push_char('!'); } else { - s.push_str(ty_to_str(cx, sig.output).as_slice()); + s.push_str(ty_to_string(cx, sig.output).as_slice()); } } } @@ -346,30 +346,30 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { ty_bot => "!".to_string(), ty_bool => "bool".to_string(), ty_char => "char".to_string(), - ty_int(t) => ast_util::int_ty_to_str(t, None, + ty_int(t) => ast_util::int_ty_to_string(t, None, ast_util::AutoSuffix).to_string(), - ty_uint(t) => ast_util::uint_ty_to_str(t, None, + ty_uint(t) => ast_util::uint_ty_to_string(t, None, ast_util::AutoSuffix).to_string(), - ty_float(t) => ast_util::float_ty_to_str(t).to_string(), - ty_box(typ) => format!("Gc<{}>", ty_to_str(cx, typ)), - ty_uniq(typ) => format!("Box<{}>", ty_to_str(cx, typ)), - ty_ptr(ref tm) => format!("*{}", mt_to_str(cx, tm)), + ty_float(t) => ast_util::float_ty_to_string(t).to_string(), + ty_box(typ) => format!("Gc<{}>", ty_to_string(cx, typ)), + ty_uniq(typ) => format!("Box<{}>", ty_to_string(cx, typ)), + ty_ptr(ref tm) => format!("*{}", mt_to_string(cx, tm)), ty_rptr(r, ref tm) => { - let mut buf = region_ptr_to_str(cx, r); - buf.push_str(mt_to_str(cx, tm).as_slice()); + let mut buf = region_ptr_to_string(cx, r); + buf.push_str(mt_to_string(cx, tm).as_slice()); buf } ty_tup(ref elems) => { - let strs: Vec = elems.iter().map(|elem| ty_to_str(cx, *elem)).collect(); + let strs: Vec = elems.iter().map(|elem| ty_to_string(cx, *elem)).collect(); format!("({})", strs.connect(",")) } ty_closure(ref f) => { - closure_to_str(cx, *f) + closure_to_string(cx, *f) } ty_bare_fn(ref f) => { - bare_fn_to_str(cx, f.fn_style, f.abi, None, &f.sig) + bare_fn_to_string(cx, f.fn_style, f.abi, None, &f.sig) } - ty_infer(infer_ty) => infer_ty.to_str(), + ty_infer(infer_ty) => infer_ty.to_string(), ty_err => "[type error]".to_string(), ty_param(ParamTy {idx: id, def_id: did, ..}) => { let ident = match cx.ty_param_defs.borrow().find(&did.node) { @@ -407,9 +407,9 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String { ty_vec(ref mt, sz) => { match sz { Some(n) => { - format!("[{}, .. {}]", mt_to_str(cx, mt), n) + format!("[{}, .. {}]", mt_to_string(cx, mt), n) } - None => format!("[{}]", ty_to_str(cx, mt.ty)), + None => format!("[{}]", ty_to_string(cx, mt.ty)), } } } @@ -427,7 +427,7 @@ pub fn parameterized(cx: &ctxt, subst::ErasedRegions => { } subst::NonerasedRegions(ref regions) => { for &r in regions.iter() { - let s = region_to_str(cx, "", false, r); + let s = region_to_string(cx, "", false, r); if !s.is_empty() { strs.push(s) } else { @@ -457,7 +457,7 @@ pub fn parameterized(cx: &ctxt, }; for t in tps.slice_to(tps.len() - num_defaults).iter() { - strs.push(ty_to_str(cx, *t)) + strs.push(ty_to_string(cx, *t)) } if cx.sess.verbose() { @@ -524,7 +524,7 @@ impl Repr for Box { } fn repr_vec(tcx: &ctxt, v: &[T]) -> String { - vec_map_to_str(v, |t| t.repr(tcx)) + vec_map_to_string(v, |t| t.repr(tcx)) } impl<'a, T:Repr> Repr for &'a [T] { @@ -570,7 +570,7 @@ impl Repr for ty::RegionParameterDef { impl Repr for ty::t { fn repr(&self, tcx: &ctxt) -> String { - ty_to_str(tcx, *self) + ty_to_string(tcx, *self) } } @@ -627,25 +627,25 @@ impl Repr for ty::ParamBounds { impl Repr for ty::TraitRef { fn repr(&self, tcx: &ctxt) -> String { - trait_ref_to_str(tcx, self) + trait_ref_to_string(tcx, self) } } impl Repr for ast::Expr { fn repr(&self, _tcx: &ctxt) -> String { - format!("expr({}: {})", self.id, pprust::expr_to_str(self)) + format!("expr({}: {})", self.id, pprust::expr_to_string(self)) } } impl Repr for ast::Path { fn repr(&self, _tcx: &ctxt) -> String { - format!("path({})", pprust::path_to_str(self)) + format!("path({})", pprust::path_to_string(self)) } } impl Repr for ast::Item { fn repr(&self, tcx: &ctxt) -> String { - format!("item({})", tcx.map.node_to_str(self.id)) + format!("item({})", tcx.map.node_to_string(self.id)) } } @@ -653,13 +653,13 @@ impl Repr for ast::Stmt { fn repr(&self, _tcx: &ctxt) -> String { format!("stmt({}: {})", ast_util::stmt_id(self), - pprust::stmt_to_str(self)) + pprust::stmt_to_string(self)) } } impl Repr for ast::Pat { fn repr(&self, _tcx: &ctxt) -> String { - format!("pat({}: {})", self.id, pprust::pat_to_str(self)) + format!("pat({}: {})", self.id, pprust::pat_to_string(self)) } } @@ -775,10 +775,10 @@ impl Repr for ty::ItemVariances { impl Repr for ty::Variance { fn repr(&self, _: &ctxt) -> String { - // The first `.to_str()` returns a &'static str (it is not an implementation - // of the ToStr trait). Because of that, we need to call `.to_str()` again + // The first `.to_string()` returns a &'static str (it is not an implementation + // of the ToString trait). Because of that, we need to call `.to_string()` again // if we want to have a `String`. - self.to_str().to_str() + self.to_string().to_string() } } @@ -823,14 +823,14 @@ impl Repr for ty::BareFnTy { fn repr(&self, tcx: &ctxt) -> String { format!("BareFnTy {{fn_style: {:?}, abi: {}, sig: {}}}", self.fn_style, - self.abi.to_str(), + self.abi.to_string(), self.sig.repr(tcx)) } } impl Repr for ty::FnSig { fn repr(&self, tcx: &ctxt) -> String { - fn_sig_to_str(tcx, self) + fn_sig_to_string(tcx, self) } } @@ -887,7 +887,7 @@ impl Repr for ty::RegionVid { impl Repr for ty::TraitStore { fn repr(&self, tcx: &ctxt) -> String { - trait_store_to_str(tcx, *self) + trait_store_to_string(tcx, *self) } } @@ -917,7 +917,7 @@ impl Repr for ty::BuiltinBounds { impl Repr for Span { fn repr(&self, tcx: &ctxt) -> String { - tcx.sess.codemap().span_to_str(*self).to_string() + tcx.sess.codemap().span_to_string(*self).to_string() } } @@ -948,7 +948,7 @@ impl UserString for ty::TraitRef { impl UserString for ty::t { fn user_string(&self, tcx: &ctxt) -> String { - ty_to_str(tcx, *self) + ty_to_string(tcx, *self) } } @@ -960,13 +960,13 @@ impl UserString for ast::Ident { impl Repr for abi::Abi { fn repr(&self, _tcx: &ctxt) -> String { - self.to_str() + self.to_string() } } impl UserString for abi::Abi { fn user_string(&self, _tcx: &ctxt) -> String { - self.to_str() + self.to_string() } } diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs index d243c61ddaff8..fb8e64ddfdff4 100644 --- a/src/librustdoc/clean/inline.rs +++ b/src/librustdoc/clean/inline.rs @@ -98,7 +98,7 @@ fn try_inline_def(cx: &core::DocContext, cx.inlined.borrow_mut().get_mut_ref().insert(did); ret.push(clean::Item { source: clean::Span::empty(), - name: Some(fqn.last().unwrap().to_str()), + name: Some(fqn.last().unwrap().to_string()), attrs: load_attrs(tcx, did), inner: inner, visibility: Some(ast::Public), @@ -134,7 +134,7 @@ pub fn record_extern_fqn(cx: &core::DocContext, match cx.maybe_typed { core::Typed(ref tcx) => { let fqn = csearch::get_item_path(tcx, did); - let fqn = fqn.move_iter().map(|i| i.to_str()).collect(); + let fqn = fqn.move_iter().map(|i| i.to_string()).collect(); cx.external_paths.borrow_mut().get_mut_ref().insert(did, (fqn, kind)); } core::NotTyped(..) => {} diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 5e84a90121f26..cc69ebc6f1867 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -406,7 +406,7 @@ impl Clean for ast::MetaItem { List(s.get().to_string(), l.clean().move_iter().collect()) } ast::MetaNameValue(ref s, ref v) => { - NameValue(s.get().to_string(), lit_to_str(v)) + NameValue(s.get().to_string(), lit_to_string(v)) } } } @@ -534,7 +534,7 @@ impl Clean for ty::BuiltinBound { external_path("Share", &empty)), }; let fqn = csearch::get_item_path(tcx, did); - let fqn = fqn.move_iter().map(|i| i.to_str()).collect(); + let fqn = fqn.move_iter().map(|i| i.to_string()).collect(); cx.external_paths.borrow_mut().get_mut_ref().insert(did, (fqn, TypeTrait)); TraitBound(ResolvedPath { @@ -553,7 +553,7 @@ impl Clean for ty::TraitRef { core::NotTyped(_) => return RegionBound, }; let fqn = csearch::get_item_path(tcx, self.def_id); - let fqn = fqn.move_iter().map(|i| i.to_str()) + let fqn = fqn.move_iter().map(|i| i.to_string()) .collect::>(); let path = external_path(fqn.last().unwrap().as_slice(), &self.substs); @@ -1136,7 +1136,7 @@ impl Primitive { return None } - pub fn to_str(&self) -> &'static str { + pub fn to_string(&self) -> &'static str { match *self { Int => "int", I8 => "i8", @@ -1163,7 +1163,7 @@ impl Primitive { pub fn to_url_str(&self) -> &'static str { match *self { Nil => "nil", - other => other.to_str(), + other => other.to_string(), } } @@ -1243,7 +1243,7 @@ impl Clean for ty::t { lifetimes: Vec::new(), type_params: Vec::new() }, decl: (ast_util::local_def(0), &fty.sig).clean(), - abi: fty.abi.to_str(), + abi: fty.abi.to_string(), }), ty::ty_closure(ref fty) => { let decl = box ClosureDecl { @@ -1268,14 +1268,14 @@ impl Clean for ty::t { }; let fqn = csearch::get_item_path(tcx, did); let fqn: Vec = fqn.move_iter().map(|i| { - i.to_str() + i.to_string() }).collect(); let kind = match ty::get(*self).sty { ty::ty_struct(..) => TypeStruct, ty::ty_trait(..) => TypeTrait, _ => TypeEnum, }; - let path = external_path(fqn.last().unwrap().to_str().as_slice(), + let path = external_path(fqn.last().unwrap().to_string().as_slice(), substs); cx.external_paths.borrow_mut().get_mut_ref().insert(did, (fqn, kind)); @@ -1584,7 +1584,7 @@ impl Clean for ast::PathSegment { } } -fn path_to_str(p: &ast::Path) -> String { +fn path_to_string(p: &ast::Path) -> String { use syntax::parse::token; let mut s = String::new(); @@ -1651,7 +1651,7 @@ impl Clean for ast::BareFnTy { type_params: Vec::new(), }, decl: self.decl.clean(), - abi: self.abi.to_str(), + abi: self.abi.to_string(), } } } @@ -1920,7 +1920,7 @@ impl ToSource for syntax::codemap::Span { } } -fn lit_to_str(lit: &ast::Lit) -> String { +fn lit_to_string(lit: &ast::Lit) -> String { match lit.node { ast::LitStr(ref st, _) => st.get().to_string(), ast::LitBinary(ref data) => format!("{:?}", data.as_slice()), @@ -1933,12 +1933,12 @@ fn lit_to_str(lit: &ast::Lit) -> String { res }, ast::LitChar(c) => format!("'{}'", c), - ast::LitInt(i, _t) => i.to_str(), - ast::LitUint(u, _t) => u.to_str(), - ast::LitIntUnsuffixed(i) => i.to_str(), + ast::LitInt(i, _t) => i.to_string(), + ast::LitUint(u, _t) => u.to_string(), + ast::LitIntUnsuffixed(i) => i.to_string(), ast::LitFloat(ref f, _t) => f.get().to_string(), ast::LitFloatUnsuffixed(ref f) => f.get().to_string(), - ast::LitBool(b) => b.to_str(), + ast::LitBool(b) => b.to_string(), ast::LitNil => "".to_string(), } } @@ -1950,8 +1950,8 @@ fn name_from_pat(p: &ast::Pat) -> String { match p.node { PatWild => "_".to_string(), PatWildMulti => "..".to_string(), - PatIdent(_, ref p, _) => path_to_str(p), - PatEnum(ref p, _) => path_to_str(p), + PatIdent(_, ref p, _) => path_to_string(p), + PatEnum(ref p, _) => path_to_string(p), PatStruct(..) => fail!("tried to get argument name from pat_struct, \ which is not allowed in function arguments"), PatTup(..) => "(tuple arg NYI)".to_string(), diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs index 0ba776e903a42..2c9baa1bd5957 100644 --- a/src/librustdoc/html/format.rs +++ b/src/librustdoc/html/format.rs @@ -342,7 +342,7 @@ impl fmt::Show for clean::Type { tybounds(f, typarams) } clean::Self(..) => f.write("Self".as_bytes()), - clean::Primitive(prim) => primitive_link(f, prim, prim.to_str()), + clean::Primitive(prim) => primitive_link(f, prim, prim.to_string()), clean::Closure(ref decl, ref region) => { write!(f, "{style}{lifetimes}|{args}|{bounds}{arrow}", style = FnStyleSpace(decl.fn_style), @@ -396,7 +396,7 @@ impl fmt::Show for clean::Type { } else { let mut m = decl.bounds .iter() - .map(|s| s.to_str()); + .map(|s| s.to_string()); format!( ": {}", m.collect::>().connect(" + ")) diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index ccd11c6761107..35f4c8841ee32 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -230,7 +230,7 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { // Transform the contents of the header into a hyphenated string let id = (s.as_slice().words().map(|s| { match s.to_ascii_opt() { - Some(s) => s.to_lower().into_str(), + Some(s) => s.to_lower().into_string(), None => s.to_string() } }).collect::>().connect("-")).to_string(); diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index 76e604ecfa287..ff05c7dd68689 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -417,7 +417,7 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> io::IoResult } try!(write!(&mut w, r#"[{:u},"{}","{}",{}"#, item.ty, item.name, path, - item.desc.to_json().to_str())); + item.desc.to_json().to_string())); match item.parent { Some(nodeid) => { let pathid = *nodeid_to_pathid.find(&nodeid).unwrap(); @@ -1250,7 +1250,7 @@ impl<'a> fmt::Show for Item<'a> { Some((ref stability, _)) => { try!(write!(fmt, "{lvl}", - lvl = stability.level.to_str(), + lvl = stability.level.to_string(), reason = match stability.text { Some(ref s) => (*s).clone(), None => InternedString::new(""), diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index fdf38dc335ce1..04f3501413a91 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -361,7 +361,7 @@ fn json_input(input: &str) -> Result { } }; match json::from_reader(&mut input) { - Err(s) => Err(s.to_str()), + Err(s) => Err(s.to_string()), Ok(json::Object(obj)) => { let mut obj = obj; // Make sure the schema is what we expect diff --git a/src/librustrt/c_str.rs b/src/librustrt/c_str.rs index 4a7ac97beed8d..531de57715935 100644 --- a/src/librustrt/c_str.rs +++ b/src/librustrt/c_str.rs @@ -725,7 +725,7 @@ mod bench { Mary had a little lamb, Little lamb Mary had a little lamb, Little lamb"; - fn bench_to_str(b: &mut Bencher, s: &str) { + fn bench_to_string(b: &mut Bencher, s: &str) { b.iter(|| { let c_str = s.to_c_str(); c_str.with_ref(|c_str_buf| check(s, c_str_buf)) @@ -734,17 +734,17 @@ mod bench { #[bench] fn bench_to_c_str_short(b: &mut Bencher) { - bench_to_str(b, s_short) + bench_to_string(b, s_short) } #[bench] fn bench_to_c_str_medium(b: &mut Bencher) { - bench_to_str(b, s_medium) + bench_to_string(b, s_medium) } #[bench] fn bench_to_c_str_long(b: &mut Bencher) { - bench_to_str(b, s_long) + bench_to_string(b, s_long) } fn bench_to_c_str_unchecked(b: &mut Bencher, s: &str) { diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs index 74caf86a63102..ac65859f8179a 100644 --- a/src/librustuv/lib.rs +++ b/src/librustuv/lib.rs @@ -387,7 +387,7 @@ impl fmt::Show for UvError { #[test] fn error_smoke_test() { let err: UvError = UvError(uvll::EOF); - assert_eq!(err.to_str(), "EOF: end of file".to_string()); + assert_eq!(err.to_string(), "EOF: end of file".to_string()); } #[cfg(unix)] diff --git a/src/librustuv/net.rs b/src/librustuv/net.rs index 82693acb1e9dc..c28f4d587c531 100644 --- a/src/librustuv/net.rs +++ b/src/librustuv/net.rs @@ -675,7 +675,7 @@ impl rtio::RtioUdpSocket for UdpWatcher { fn join_multicast(&mut self, multi: rtio::IpAddr) -> Result<(), IoError> { let _m = self.fire_homing_missile(); status_to_io_result(unsafe { - multi.to_str().with_c_str(|m_addr| { + multi.to_string().with_c_str(|m_addr| { uvll::uv_udp_set_membership(self.handle, m_addr, ptr::null(), uvll::UV_JOIN_GROUP) @@ -686,7 +686,7 @@ impl rtio::RtioUdpSocket for UdpWatcher { fn leave_multicast(&mut self, multi: rtio::IpAddr) -> Result<(), IoError> { let _m = self.fire_homing_missile(); status_to_io_result(unsafe { - multi.to_str().with_c_str(|m_addr| { + multi.to_string().with_c_str(|m_addr| { uvll::uv_udp_set_membership(self.handle, m_addr, ptr::null(), uvll::UV_LEAVE_GROUP) diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs index 054a97315add0..7159350072d11 100644 --- a/src/libsemver/lib.rs +++ b/src/libsemver/lib.rs @@ -267,7 +267,7 @@ pub fn parse(s: &str) -> Option { let v = parse_iter(&mut s.chars()); match v { Some(v) => { - if v.to_str().equiv(&s) { + if v.to_string().equiv(&s) { Some(v) } else { None @@ -388,11 +388,11 @@ fn test_show() { } #[test] -fn test_to_str() { - assert_eq!(parse("1.2.3").unwrap().to_str(), "1.2.3".to_string()); - assert_eq!(parse("1.2.3-alpha1").unwrap().to_str(), "1.2.3-alpha1".to_string()); - assert_eq!(parse("1.2.3+build.42").unwrap().to_str(), "1.2.3+build.42".to_string()); - assert_eq!(parse("1.2.3-alpha1+42").unwrap().to_str(), "1.2.3-alpha1+42".to_string()); +fn test_to_string() { + assert_eq!(parse("1.2.3").unwrap().to_string(), "1.2.3".to_string()); + assert_eq!(parse("1.2.3-alpha1").unwrap().to_string(), "1.2.3-alpha1".to_string()); + assert_eq!(parse("1.2.3+build.42").unwrap().to_string(), "1.2.3+build.42".to_string()); + assert_eq!(parse("1.2.3-alpha1+42").unwrap().to_string(), "1.2.3-alpha1+42".to_string()); } #[test] diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index fa8d341e05de2..c2c5764b43980 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -120,7 +120,7 @@ impl ToJson for MyStruct { fn main() { let test2: MyStruct = MyStruct {attr1: 1, attr2:"test".to_string()}; let tjson: json::Json = test2.to_json(); - let json_str: String = tjson.to_str().into_string(); + let json_str: String = tjson.to_string().into_string(); } ``` @@ -214,7 +214,7 @@ fn main() { let test2: TestStruct1 = TestStruct1 {data_int: 1, data_str:"toto".to_string(), data_vector:vec![2,3,4,5]}; let tjson: json::Json = test2.to_json(); - let json_str: String = tjson.to_str().into_string(); + let json_str: String = tjson.to_string().into_string(); // Deserialize like before. @@ -2317,50 +2317,50 @@ mod tests { #[test] fn test_write_null() { - assert_eq!(Null.to_str().into_string(), "null".to_string()); + assert_eq!(Null.to_string().into_string(), "null".to_string()); assert_eq!(Null.to_pretty_str().into_string(), "null".to_string()); } #[test] fn test_write_number() { - assert_eq!(Number(3.0).to_str().into_string(), "3".to_string()); + assert_eq!(Number(3.0).to_string().into_string(), "3".to_string()); assert_eq!(Number(3.0).to_pretty_str().into_string(), "3".to_string()); - assert_eq!(Number(3.1).to_str().into_string(), "3.1".to_string()); + assert_eq!(Number(3.1).to_string().into_string(), "3.1".to_string()); assert_eq!(Number(3.1).to_pretty_str().into_string(), "3.1".to_string()); - assert_eq!(Number(-1.5).to_str().into_string(), "-1.5".to_string()); + assert_eq!(Number(-1.5).to_string().into_string(), "-1.5".to_string()); assert_eq!(Number(-1.5).to_pretty_str().into_string(), "-1.5".to_string()); - assert_eq!(Number(0.5).to_str().into_string(), "0.5".to_string()); + assert_eq!(Number(0.5).to_string().into_string(), "0.5".to_string()); assert_eq!(Number(0.5).to_pretty_str().into_string(), "0.5".to_string()); } #[test] fn test_write_str() { - assert_eq!(String("".to_string()).to_str().into_string(), "\"\"".to_string()); + assert_eq!(String("".to_string()).to_string().into_string(), "\"\"".to_string()); assert_eq!(String("".to_string()).to_pretty_str().into_string(), "\"\"".to_string()); - assert_eq!(String("foo".to_string()).to_str().into_string(), "\"foo\"".to_string()); + assert_eq!(String("foo".to_string()).to_string().into_string(), "\"foo\"".to_string()); assert_eq!(String("foo".to_string()).to_pretty_str().into_string(), "\"foo\"".to_string()); } #[test] fn test_write_bool() { - assert_eq!(Boolean(true).to_str().into_string(), "true".to_string()); + assert_eq!(Boolean(true).to_string().into_string(), "true".to_string()); assert_eq!(Boolean(true).to_pretty_str().into_string(), "true".to_string()); - assert_eq!(Boolean(false).to_str().into_string(), "false".to_string()); + assert_eq!(Boolean(false).to_string().into_string(), "false".to_string()); assert_eq!(Boolean(false).to_pretty_str().into_string(), "false".to_string()); } #[test] fn test_write_list() { - assert_eq!(List(vec![]).to_str().into_string(), "[]".to_string()); + assert_eq!(List(vec![]).to_string().into_string(), "[]".to_string()); assert_eq!(List(vec![]).to_pretty_str().into_string(), "[]".to_string()); - assert_eq!(List(vec![Boolean(true)]).to_str().into_string(), "[true]".to_string()); + assert_eq!(List(vec![Boolean(true)]).to_string().into_string(), "[true]".to_string()); assert_eq!( List(vec![Boolean(true)]).to_pretty_str().into_string(), "\ @@ -2374,7 +2374,7 @@ mod tests { Null, List(vec![String("foo\nbar".to_string()), Number(3.5)])]); - assert_eq!(long_test_list.to_str().into_string(), + assert_eq!(long_test_list.to_string().into_string(), "[false,null,[\"foo\\nbar\",3.5]]".to_string()); assert_eq!( long_test_list.to_pretty_str().into_string(), @@ -2392,13 +2392,13 @@ mod tests { #[test] fn test_write_object() { - assert_eq!(mk_object([]).to_str().into_string(), "{}".to_string()); + assert_eq!(mk_object([]).to_string().into_string(), "{}".to_string()); assert_eq!(mk_object([]).to_pretty_str().into_string(), "{}".to_string()); assert_eq!( mk_object([ ("a".to_string(), Boolean(true)) - ]).to_str().into_string(), + ]).to_string().into_string(), "{\"a\":true}".to_string() ); assert_eq!( @@ -2417,7 +2417,7 @@ mod tests { ]); assert_eq!( - complex_obj.to_str().into_string(), + complex_obj.to_string().into_string(), "{\ \"b\":[\ {\"c\":\"\\f\\r\"},\ @@ -2450,7 +2450,7 @@ mod tests { // We can't compare the strings directly because the object fields be // printed in a different order. - assert_eq!(a.clone(), from_str(a.to_str().as_slice()).unwrap()); + assert_eq!(a.clone(), from_str(a.to_string().as_slice()).unwrap()); assert_eq!(a.clone(), from_str(a.to_pretty_str().as_slice()).unwrap()); } diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 2730d90f05fc1..19d3450da72a9 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -343,7 +343,7 @@ impl<'a> AsciiStr for &'a [Ascii] { impl IntoStr for Vec { #[inline] - fn into_str(self) -> String { + fn into_string(self) -> String { unsafe { let s: &str = mem::transmute(self.as_slice()); s.to_string() @@ -576,12 +576,12 @@ mod tests { assert_eq!(v.as_slice().to_ascii(), v2ascii!([40, 32, 59])); assert_eq!("( ;".to_string().as_slice().to_ascii(), v2ascii!([40, 32, 59])); - assert_eq!("abCDef&?#".to_ascii().to_lower().into_str(), "abcdef&?#".to_string()); - assert_eq!("abCDef&?#".to_ascii().to_upper().into_str(), "ABCDEF&?#".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_lower().into_string(), "abcdef&?#".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_upper().into_string(), "ABCDEF&?#".to_string()); - assert_eq!("".to_ascii().to_lower().into_str(), "".to_string()); - assert_eq!("YMCA".to_ascii().to_lower().into_str(), "ymca".to_string()); - assert_eq!("abcDEFxyz:.;".to_ascii().to_upper().into_str(), "ABCDEFXYZ:.;".to_string()); + assert_eq!("".to_ascii().to_lower().into_string(), "".to_string()); + assert_eq!("YMCA".to_ascii().to_lower().into_string(), "ymca".to_string()); + assert_eq!("abcDEFxyz:.;".to_ascii().to_upper().into_string(), "ABCDEFXYZ:.;".to_string()); assert!("aBcDeF&?#".to_ascii().eq_ignore_case("AbCdEf&?#".to_ascii())); @@ -593,11 +593,11 @@ mod tests { #[test] fn test_ascii_vec_ng() { - assert_eq!("abCDef&?#".to_ascii().to_lower().into_str(), "abcdef&?#".to_string()); - assert_eq!("abCDef&?#".to_ascii().to_upper().into_str(), "ABCDEF&?#".to_string()); - assert_eq!("".to_ascii().to_lower().into_str(), "".to_string()); - assert_eq!("YMCA".to_ascii().to_lower().into_str(), "ymca".to_string()); - assert_eq!("abcDEFxyz:.;".to_ascii().to_upper().into_str(), "ABCDEFXYZ:.;".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_lower().into_string(), "abcdef&?#".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_upper().into_string(), "ABCDEF&?#".to_string()); + assert_eq!("".to_ascii().to_lower().into_string(), "".to_string()); + assert_eq!("YMCA".to_ascii().to_lower().into_string(), "ymca".to_string()); + assert_eq!("abcDEFxyz:.;".to_ascii().to_upper().into_string(), "ABCDEFXYZ:.;".to_string()); } #[test] @@ -613,9 +613,9 @@ mod tests { } #[test] - fn test_ascii_into_str() { - assert_eq!(vec2ascii![40, 32, 59].into_str(), "( ;".to_string()); - assert_eq!(vec2ascii!(40, 32, 59).into_str(), "( ;".to_string()); + fn test_ascii_into_string() { + assert_eq!(vec2ascii![40, 32, 59].into_string(), "( ;".to_string()); + assert_eq!(vec2ascii!(40, 32, 59).into_string(), "( ;".to_string()); } #[test] @@ -755,8 +755,8 @@ mod tests { } #[test] - fn test_to_str() { - let s = Ascii{ chr: 't' as u8 }.to_str(); + fn test_to_string() { + let s = Ascii{ chr: 't' as u8 }.to_string(); assert_eq!(s, "t".to_string()); } diff --git a/src/libstd/collections/lru_cache.rs b/src/libstd/collections/lru_cache.rs index 8ec5146c7b20f..560d8b02442d8 100644 --- a/src/libstd/collections/lru_cache.rs +++ b/src/libstd/collections/lru_cache.rs @@ -319,20 +319,20 @@ mod tests { } #[test] - fn test_to_str() { + fn test_to_string() { let mut cache: LruCache = LruCache::new(3); cache.put(1, 10); cache.put(2, 20); cache.put(3, 30); - assert_eq!(cache.to_str(), "{3: 30, 2: 20, 1: 10}".to_string()); + assert_eq!(cache.to_string(), "{3: 30, 2: 20, 1: 10}".to_string()); cache.put(2, 22); - assert_eq!(cache.to_str(), "{2: 22, 3: 30, 1: 10}".to_string()); + assert_eq!(cache.to_string(), "{2: 22, 3: 30, 1: 10}".to_string()); cache.put(6, 60); - assert_eq!(cache.to_str(), "{6: 60, 2: 22, 3: 30}".to_string()); + assert_eq!(cache.to_string(), "{6: 60, 2: 22, 3: 30}".to_string()); cache.get(&3); - assert_eq!(cache.to_str(), "{3: 30, 6: 60, 2: 22}".to_string()); + assert_eq!(cache.to_string(), "{3: 30, 6: 60, 2: 22}".to_string()); cache.change_capacity(2); - assert_eq!(cache.to_str(), "{3: 30, 6: 60}".to_string()); + assert_eq!(cache.to_string(), "{3: 30, 6: 60}".to_string()); } #[test] @@ -343,6 +343,6 @@ mod tests { cache.clear(); assert!(cache.get(&1).is_none()); assert!(cache.get(&2).is_none()); - assert_eq!(cache.to_str(), "{}".to_string()); + assert_eq!(cache.to_string(), "{}".to_string()); } } diff --git a/src/libstd/io/fs.rs b/src/libstd/io/fs.rs index a801dd0e7cb35..dc3c876494732 100644 --- a/src/libstd/io/fs.rs +++ b/src/libstd/io/fs.rs @@ -915,7 +915,7 @@ mod test { macro_rules! error( ($e:expr, $s:expr) => ( match $e { Ok(val) => fail!("Should have been an error, was {:?}", val), - Err(ref err) => assert!(err.to_str().as_slice().contains($s.as_slice()), + Err(ref err) => assert!(err.to_string().as_slice().contains($s.as_slice()), format!("`{}` did not contain `{}`", err, $s)) } ) ) @@ -1167,7 +1167,7 @@ mod test { for n in range(0,3) { let f = dir.join(format!("{}.txt", n)); let mut w = check!(File::create(&f)); - let msg_str = format!("{}{}", prefix, n.to_str()); + let msg_str = format!("{}{}", prefix, n.to_string()); let msg = msg_str.as_slice().as_bytes(); check!(w.write(msg)); } diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs index 5eca5361835e3..c1838adccbd9e 100644 --- a/src/libstd/io/mem.rs +++ b/src/libstd/io/mem.rs @@ -497,7 +497,7 @@ mod test { writer.write_line("testing").unwrap(); writer.write_str("testing").unwrap(); let mut r = BufReader::new(writer.get_ref()); - assert_eq!(r.read_to_str().unwrap(), "testingtesting\ntesting".to_string()); + assert_eq!(r.read_to_string().unwrap(), "testingtesting\ntesting".to_string()); } #[test] @@ -507,14 +507,14 @@ mod test { writer.write_char('\n').unwrap(); writer.write_char('ệ').unwrap(); let mut r = BufReader::new(writer.get_ref()); - assert_eq!(r.read_to_str().unwrap(), "a\nệ".to_string()); + assert_eq!(r.read_to_string().unwrap(), "a\nệ".to_string()); } #[test] fn test_read_whole_string_bad() { let buf = [0xff]; let mut r = BufReader::new(buf); - match r.read_to_str() { + match r.read_to_string() { Ok(..) => fail!(), Err(..) => {} } diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index d9755cdce1a4f..46deda9871efc 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -701,7 +701,7 @@ pub trait Reader { /// This function returns all of the same errors as `read_to_end` with an /// additional error if the reader's contents are not a valid sequence of /// UTF-8 bytes. - fn read_to_str(&mut self) -> IoResult { + fn read_to_string(&mut self) -> IoResult { self.read_to_end().and_then(|s| { match str::from_utf8(s.as_slice()) { Some(s) => Ok(s.to_string()), diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index 2c54bd895e952..448a5193aa431 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -443,10 +443,10 @@ mod test { } #[test] - fn ipv6_addr_to_str() { + fn ipv6_addr_to_string() { let a1 = Ipv6Addr(0, 0, 0, 0, 0, 0xffff, 0xc000, 0x280); - assert!(a1.to_str() == "::ffff:192.0.2.128".to_string() || - a1.to_str() == "::FFFF:192.0.2.128".to_string()); - assert_eq!(Ipv6Addr(8, 9, 10, 11, 12, 13, 14, 15).to_str(), "8:9:a:b:c:d:e:f".to_string()); + assert!(a1.to_string() == "::ffff:192.0.2.128".to_string() || + a1.to_string() == "::FFFF:192.0.2.128".to_string()); + assert_eq!(Ipv6Addr(8, 9, 10, 11, 12, 13, 14, 15).to_string(), "8:9:a:b:c:d:e:f".to_string()); } } diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 8ffb057c93458..8834005e53c88 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -467,7 +467,7 @@ mod test { iotest!(fn listen_ip4_localhost() { let socket_addr = next_test_ip4(); - let ip_str = socket_addr.ip.to_str(); + let ip_str = socket_addr.ip.to_string(); let port = socket_addr.port; let listener = TcpListener::bind(ip_str.as_slice(), port); let mut acceptor = listener.listen(); @@ -485,7 +485,7 @@ mod test { iotest!(fn connect_localhost() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -502,7 +502,7 @@ mod test { iotest!(fn connect_ip4_loopback() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -519,7 +519,7 @@ mod test { iotest!(fn connect_ip6_loopback() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -536,7 +536,7 @@ mod test { iotest!(fn smoke_test_ip4() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -553,7 +553,7 @@ mod test { iotest!(fn smoke_test_ip6() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -570,7 +570,7 @@ mod test { iotest!(fn read_eof_ip4() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -587,7 +587,7 @@ mod test { iotest!(fn read_eof_ip6() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -604,7 +604,7 @@ mod test { iotest!(fn read_eof_twice_ip4() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -629,7 +629,7 @@ mod test { iotest!(fn read_eof_twice_ip6() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -654,7 +654,7 @@ mod test { iotest!(fn write_close_ip4() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -681,7 +681,7 @@ mod test { iotest!(fn write_close_ip6() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -708,7 +708,7 @@ mod test { iotest!(fn multiple_connect_serial_ip4() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let max = 10u; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -729,7 +729,7 @@ mod test { iotest!(fn multiple_connect_serial_ip6() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let max = 10u; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -750,7 +750,7 @@ mod test { iotest!(fn multiple_connect_interleaved_greedy_schedule_ip4() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; static MAX: int = 10; let acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -772,7 +772,7 @@ mod test { connect(0, addr); fn connect(i: int, addr: SocketAddr) { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; if i == MAX { return } @@ -789,7 +789,7 @@ mod test { iotest!(fn multiple_connect_interleaved_greedy_schedule_ip6() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; static MAX: int = 10; let acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -811,7 +811,7 @@ mod test { connect(0, addr); fn connect(i: int, addr: SocketAddr) { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; if i == MAX { return } @@ -829,7 +829,7 @@ mod test { iotest!(fn multiple_connect_interleaved_lazy_schedule_ip4() { static MAX: int = 10; let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -850,7 +850,7 @@ mod test { connect(0, addr); fn connect(i: int, addr: SocketAddr) { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; if i == MAX { return } @@ -868,7 +868,7 @@ mod test { iotest!(fn multiple_connect_interleaved_lazy_schedule_ip6() { static MAX: int = 10; let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -889,7 +889,7 @@ mod test { connect(0, addr); fn connect(i: int, addr: SocketAddr) { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; if i == MAX { return } @@ -905,7 +905,7 @@ mod test { }) pub fn socket_name(addr: SocketAddr) { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut listener = TcpListener::bind(ip_str.as_slice(), port).unwrap(); @@ -917,7 +917,7 @@ mod test { } pub fn peer_name(addr: SocketAddr) { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); spawn(proc() { @@ -954,7 +954,7 @@ mod test { let port = addr.port; let (tx, rx) = channel(); spawn(proc() { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let mut srv = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); tx.send(()); let mut cl = srv.accept().unwrap(); @@ -965,7 +965,7 @@ mod test { }); rx.recv(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let mut c = TcpStream::connect(ip_str.as_slice(), port).unwrap(); let mut b = [0, ..10]; assert_eq!(c.read(b), Ok(1)); @@ -975,7 +975,7 @@ mod test { iotest!(fn double_bind() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let listener = TcpListener::bind(ip_str.as_slice(), port).unwrap().listen(); assert!(listener.is_ok()); @@ -994,7 +994,7 @@ mod test { let (tx, rx) = channel(); spawn(proc() { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); rx.recv(); let _stream = TcpStream::connect(ip_str.as_slice(), port).unwrap(); // Close @@ -1002,7 +1002,7 @@ mod test { }); { - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); tx.send(()); { @@ -1012,12 +1012,12 @@ mod test { } // Close listener } - let _listener = TcpListener::bind(addr.ip.to_str().as_slice(), port); + let _listener = TcpListener::bind(addr.ip.to_string().as_slice(), port); }) iotest!(fn tcp_clone_smoke() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -1048,7 +1048,7 @@ mod test { iotest!(fn tcp_clone_two_read() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); let (tx1, rx) = channel(); @@ -1082,7 +1082,7 @@ mod test { iotest!(fn tcp_clone_two_write() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut acceptor = TcpListener::bind(ip_str.as_slice(), port).listen(); @@ -1111,7 +1111,7 @@ mod test { use rt::rtio::RtioTcpStream; let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let a = TcpListener::bind(ip_str.as_slice(), port).unwrap().listen(); spawn(proc() { @@ -1129,7 +1129,7 @@ mod test { iotest!(fn accept_timeout() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut a = TcpListener::bind(ip_str.as_slice(), port).unwrap().listen().unwrap(); @@ -1150,7 +1150,7 @@ mod test { if !cfg!(target_os = "freebsd") { let (tx, rx) = channel(); spawn(proc() { - tx.send(TcpStream::connect(addr.ip.to_str().as_slice(), + tx.send(TcpStream::connect(addr.ip.to_string().as_slice(), port).unwrap()); }); let _l = rx.recv(); @@ -1168,7 +1168,7 @@ mod test { // Unset the timeout and make sure that this always blocks. a.set_timeout(None); spawn(proc() { - drop(TcpStream::connect(addr.ip.to_str().as_slice(), + drop(TcpStream::connect(addr.ip.to_string().as_slice(), port).unwrap()); }); a.accept().unwrap(); @@ -1176,7 +1176,7 @@ mod test { iotest!(fn close_readwrite_smoke() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let a = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); let (_tx, rx) = channel::<()>(); @@ -1214,7 +1214,7 @@ mod test { iotest!(fn close_read_wakes_up() { let addr = next_test_ip4(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let a = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); let (_tx, rx) = channel::<()>(); @@ -1241,7 +1241,7 @@ mod test { iotest!(fn readwrite_timeouts() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut a = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); let (tx, rx) = channel::<()>(); @@ -1275,7 +1275,7 @@ mod test { iotest!(fn read_timeouts() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut a = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); let (tx, rx) = channel::<()>(); @@ -1305,7 +1305,7 @@ mod test { iotest!(fn write_timeouts() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut a = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); let (tx, rx) = channel::<()>(); @@ -1334,7 +1334,7 @@ mod test { iotest!(fn timeout_concurrent_read() { let addr = next_test_ip6(); - let ip_str = addr.ip.to_str(); + let ip_str = addr.ip.to_string(); let port = addr.port; let mut a = TcpListener::bind(ip_str.as_slice(), port).listen().unwrap(); let (tx, rx) = channel::<()>(); diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index 1dcf08b2322bb..91a01225a3971 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -615,7 +615,7 @@ mod tests { }) pub fn read_all(input: &mut Reader) -> String { - input.read_to_str().unwrap() + input.read_to_string().unwrap() } pub fn run_output(cmd: Command) -> String { diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index e5a64f785ce96..cdd083202e085 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -391,7 +391,7 @@ mod tests { set_stdout(box w); println!("hello!"); }); - assert_eq!(r.read_to_str().unwrap(), "hello!\n".to_string()); + assert_eq!(r.read_to_string().unwrap(), "hello!\n".to_string()); }) iotest!(fn capture_stderr() { @@ -404,7 +404,7 @@ mod tests { ::realstd::io::stdio::set_stderr(box w); fail!("my special message"); }); - let s = r.read_to_str().unwrap(); + let s = r.read_to_string().unwrap(); assert!(s.as_slice().contains("my special message")); }) } diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index 83a01feee9017..2acf12b76c00a 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -379,21 +379,21 @@ mod test { let mut r = BufReader::new(data.as_bytes()); { let mut r = LimitReader::new(r.by_ref(), 3); - assert_eq!(r.read_line(), Ok("012".to_str())); + assert_eq!(r.read_line(), Ok("012".to_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_str())); + assert_eq!(r.read_line(), Ok("3456789\n".to_string())); assert_eq!(r.limit(), 1); - assert_eq!(r.read_line(), Ok("0".to_str())); + assert_eq!(r.read_line(), Ok("0".to_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_str())); + assert_eq!(r.read_line(), Ok("23456789\n".to_string())); } } diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index bbf1458da216e..c94a455f6e53f 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -244,7 +244,7 @@ impl FloatMath for f32 { /// /// * num - The float value #[inline] -pub fn to_str(num: f32) -> String { +pub fn to_string(num: f32) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, strconv::SignNeg, strconv::DigAll, strconv::ExpNone, false); r @@ -333,7 +333,7 @@ pub fn to_str_exp_digits(num: f32, dig: uint, upper: bool) -> String { r } -impl num::ToStrRadix for f32 { +impl num::ToStringRadix for f32 { /// Converts a float to a string in a given radix /// /// # Arguments diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index cfa8534160bae..25312e16bcb12 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -252,7 +252,7 @@ impl FloatMath for f64 { /// /// * num - The float value #[inline] -pub fn to_str(num: f64) -> String { +pub fn to_string(num: f64) -> String { let (r, _) = strconv::float_to_str_common( num, 10u, true, strconv::SignNeg, strconv::DigAll, strconv::ExpNone, false); r @@ -341,7 +341,7 @@ pub fn to_str_exp_digits(num: f64, dig: uint, upper: bool) -> String { r } -impl num::ToStrRadix for f64 { +impl num::ToStringRadix for f64 { /// Converts a float to a string in a given radix /// /// # Arguments diff --git a/src/libstd/num/i16.rs b/src/libstd/num/i16.rs index cfa0662e2256d..a7c95240064d6 100644 --- a/src/libstd/num/i16.rs +++ b/src/libstd/num/i16.rs @@ -13,7 +13,7 @@ #![doc(primitive = "i16")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/i32.rs b/src/libstd/num/i32.rs index 3c656b20ee524..53ca224609a1b 100644 --- a/src/libstd/num/i32.rs +++ b/src/libstd/num/i32.rs @@ -13,7 +13,7 @@ #![doc(primitive = "i32")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/i64.rs b/src/libstd/num/i64.rs index 857f78efc9cfd..09183aa46104c 100644 --- a/src/libstd/num/i64.rs +++ b/src/libstd/num/i64.rs @@ -13,7 +13,7 @@ #![doc(primitive = "i64")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/i8.rs b/src/libstd/num/i8.rs index a939c1d6b7629..dcd90195db2af 100644 --- a/src/libstd/num/i8.rs +++ b/src/libstd/num/i8.rs @@ -13,7 +13,7 @@ #![doc(primitive = "i8")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/int.rs b/src/libstd/num/int.rs index 415d11b3145b3..9611bcdd079f1 100644 --- a/src/libstd/num/int.rs +++ b/src/libstd/num/int.rs @@ -13,7 +13,7 @@ #![doc(primitive = "int")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index 889a42ec00eaa..7dfc9a1be3a70 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -51,7 +51,7 @@ impl FromStrRadix for $T { /// Convert to a string as a byte slice in a given base. /// -/// Use in place of x.to_str() when you do not need to store the string permanently +/// Use in place of x.to_string() when you do not need to store the string permanently /// /// # Examples /// @@ -74,7 +74,7 @@ pub fn to_str_bytes(n: $T, radix: uint, f: |v: &[u8]| -> U) -> U { f(buf.slice(0, amt)) } -impl ToStrRadix for $T { +impl ToStringRadix for $T { /// Convert to a string in a given base. #[inline] fn to_str_radix(&self, radix: uint) -> String { @@ -88,7 +88,7 @@ mod tests { use super::*; use i32; - use num::ToStrRadix; + use num::ToStringRadix; use str::StrSlice; #[test] @@ -135,7 +135,7 @@ mod tests { } #[test] - fn test_to_str() { + fn test_to_string() { assert_eq!((0 as $T).to_str_radix(10u), "0".to_string()); assert_eq!((1 as $T).to_str_radix(10u), "1".to_string()); assert_eq!((-1 as $T).to_str_radix(10u), "-1".to_string()); @@ -147,28 +147,28 @@ mod tests { #[test] fn test_int_to_str_overflow() { let mut i8_val: i8 = 127_i8; - assert_eq!(i8_val.to_str(), "127".to_string()); + assert_eq!(i8_val.to_string(), "127".to_string()); i8_val += 1 as i8; - assert_eq!(i8_val.to_str(), "-128".to_string()); + assert_eq!(i8_val.to_string(), "-128".to_string()); let mut i16_val: i16 = 32_767_i16; - assert_eq!(i16_val.to_str(), "32767".to_string()); + assert_eq!(i16_val.to_string(), "32767".to_string()); i16_val += 1 as i16; - assert_eq!(i16_val.to_str(), "-32768".to_string()); + assert_eq!(i16_val.to_string(), "-32768".to_string()); let mut i32_val: i32 = 2_147_483_647_i32; - assert_eq!(i32_val.to_str(), "2147483647".to_string()); + assert_eq!(i32_val.to_string(), "2147483647".to_string()); i32_val += 1 as i32; - assert_eq!(i32_val.to_str(), "-2147483648".to_string()); + assert_eq!(i32_val.to_string(), "-2147483648".to_string()); let mut i64_val: i64 = 9_223_372_036_854_775_807_i64; - assert_eq!(i64_val.to_str(), "9223372036854775807".to_string()); + assert_eq!(i64_val.to_string(), "9223372036854775807".to_string()); i64_val += 1 as i64; - assert_eq!(i64_val.to_str(), "-9223372036854775808".to_string()); + assert_eq!(i64_val.to_string(), "-9223372036854775808".to_string()); } #[test] diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index 7301f9b08e9dc..4d8180dcb5301 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -111,7 +111,7 @@ pub trait FloatMath: Float { } /// A generic trait for converting a value to a string with a radix (base) -pub trait ToStrRadix { +pub trait ToStringRadix { fn to_str_radix(&self, radix: uint) -> String; } diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 5028987f44fdd..465a490932e20 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -146,7 +146,7 @@ static NAN_BUF: [u8, ..3] = ['N' as u8, 'a' as u8, 'N' as u8]; /** * Converts an integral number to its string representation as a byte vector. * This is meant to be a common base implementation for all integral string - * conversion functions like `to_str()` or `to_str_radix()`. + * conversion functions like `to_string()` or `to_str_radix()`. * * # Arguments * - `num` - The number to convert. Accepts any number that @@ -226,7 +226,7 @@ pub fn int_to_str_bytes_common(num: T, radix: uint, sign: SignFormat, f: /** * Converts a number to its string representation as a byte vector. * This is meant to be a common base implementation for all numeric string - * conversion functions like `to_str()` or `to_str_radix()`. + * conversion functions like `to_string()` or `to_str_radix()`. * * # Arguments * - `num` - The number to convert. Accepts any number that @@ -819,7 +819,7 @@ mod bench { mod uint { use super::test::Bencher; use rand::{weak_rng, Rng}; - use num::ToStrRadix; + use num::ToStringRadix; #[bench] fn to_str_bin(b: &mut Bencher) { @@ -855,7 +855,7 @@ mod bench { mod int { use super::test::Bencher; use rand::{weak_rng, Rng}; - use num::ToStrRadix; + use num::ToStringRadix; #[bench] fn to_str_bin(b: &mut Bencher) { @@ -894,9 +894,9 @@ mod bench { use f64; #[bench] - fn float_to_str(b: &mut Bencher) { + fn float_to_string(b: &mut Bencher) { let mut rng = weak_rng(); - b.iter(|| { f64::to_str(rng.gen()); }) + b.iter(|| { f64::to_string(rng.gen()); }) } } } diff --git a/src/libstd/num/u16.rs b/src/libstd/num/u16.rs index 3b018414be2d4..ea40b23a43a46 100644 --- a/src/libstd/num/u16.rs +++ b/src/libstd/num/u16.rs @@ -13,7 +13,7 @@ #![doc(primitive = "u16")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/u32.rs b/src/libstd/num/u32.rs index 980129431095d..777c7d22d3e44 100644 --- a/src/libstd/num/u32.rs +++ b/src/libstd/num/u32.rs @@ -13,7 +13,7 @@ #![doc(primitive = "u32")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/u64.rs b/src/libstd/num/u64.rs index b3a8bfc20df15..6a5a36403bdb1 100644 --- a/src/libstd/num/u64.rs +++ b/src/libstd/num/u64.rs @@ -13,7 +13,7 @@ #![doc(primitive = "u64")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/u8.rs b/src/libstd/num/u8.rs index d72049d253302..fd18ee87e64e9 100644 --- a/src/libstd/num/u8.rs +++ b/src/libstd/num/u8.rs @@ -13,7 +13,7 @@ #![doc(primitive = "u8")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs index 1f43ad8af3398..025c4c363c2b2 100644 --- a/src/libstd/num/uint.rs +++ b/src/libstd/num/uint.rs @@ -13,7 +13,7 @@ #![doc(primitive = "uint")] use from_str::FromStr; -use num::{ToStrRadix, FromStrRadix}; +use num::{ToStringRadix, FromStrRadix}; use num::strconv; use option::Option; use slice::ImmutableVector; diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 769588d0bcb06..eb57101f45031 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -52,7 +52,7 @@ impl FromStrRadix for $T { /// Convert to a string as a byte slice in a given base. /// -/// Use in place of x.to_str() when you do not need to store the string permanently +/// Use in place of x.to_string() when you do not need to store the string permanently /// /// # Examples /// @@ -75,7 +75,7 @@ pub fn to_str_bytes(n: $T, radix: uint, f: |v: &[u8]| -> U) -> U { f(buf.slice(0, amt)) } -impl ToStrRadix for $T { +impl ToStringRadix for $T { /// Convert to a string in a given base. #[inline] fn to_str_radix(&self, radix: uint) -> String { @@ -88,12 +88,12 @@ mod tests { use prelude::*; use super::*; - use num::ToStrRadix; + use num::ToStringRadix; use str::StrSlice; use u16; #[test] - pub fn test_to_str() { + pub fn test_to_string() { assert_eq!((0 as $T).to_str_radix(10u), "0".to_string()); assert_eq!((1 as $T).to_str_radix(10u), "1".to_string()); assert_eq!((2 as $T).to_str_radix(10u), "2".to_string()); @@ -133,28 +133,28 @@ mod tests { #[test] fn test_uint_to_str_overflow() { let mut u8_val: u8 = 255_u8; - assert_eq!(u8_val.to_str(), "255".to_string()); + assert_eq!(u8_val.to_string(), "255".to_string()); u8_val += 1 as u8; - assert_eq!(u8_val.to_str(), "0".to_string()); + assert_eq!(u8_val.to_string(), "0".to_string()); let mut u16_val: u16 = 65_535_u16; - assert_eq!(u16_val.to_str(), "65535".to_string()); + assert_eq!(u16_val.to_string(), "65535".to_string()); u16_val += 1 as u16; - assert_eq!(u16_val.to_str(), "0".to_string()); + assert_eq!(u16_val.to_string(), "0".to_string()); let mut u32_val: u32 = 4_294_967_295_u32; - assert_eq!(u32_val.to_str(), "4294967295".to_string()); + assert_eq!(u32_val.to_string(), "4294967295".to_string()); u32_val += 1 as u32; - assert_eq!(u32_val.to_str(), "0".to_string()); + assert_eq!(u32_val.to_string(), "0".to_string()); let mut u64_val: u64 = 18_446_744_073_709_551_615_u64; - assert_eq!(u64_val.to_str(), "18446744073709551615".to_string()); + assert_eq!(u64_val.to_string(), "18446744073709551615".to_string()); u64_val += 1 as u64; - assert_eq!(u64_val.to_str(), "0".to_string()); + assert_eq!(u64_val.to_string(), "0".to_string()); } #[test] diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index d98cfb7d8eece..5c6e140bd29b3 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -545,7 +545,7 @@ mod tests { ($path:expr, $disp:ident, $exp:expr) => ( { let path = Path::new($path); - assert!(path.$disp().to_str().as_slice() == $exp); + assert!(path.$disp().to_string().as_slice() == $exp); } ) ) diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 4d6f8d0888f3e..30d3e877a45df 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -1310,9 +1310,9 @@ mod tests { #[test] fn test_display_str() { let path = Path::new("foo"); - assert_eq!(path.display().to_str(), "foo".to_string()); + assert_eq!(path.display().to_string(), "foo".to_string()); let path = Path::new(b"\\"); - assert_eq!(path.filename_display().to_str(), "".to_string()); + assert_eq!(path.filename_display().to_string(), "".to_string()); let path = Path::new("foo"); let mo = path.display().as_maybe_owned(); diff --git a/src/libstd/prelude.rs b/src/libstd/prelude.rs index dfe6988624eb0..b4638e488caa3 100644 --- a/src/libstd/prelude.rs +++ b/src/libstd/prelude.rs @@ -75,7 +75,7 @@ #[doc(no_inline)] pub use io::{Buffer, Writer, Reader, Seek}; #[doc(no_inline)] pub use str::{Str, StrVector, StrSlice, OwnedStr}; #[doc(no_inline)] pub use str::{IntoMaybeOwned, StrAllocating}; -#[doc(no_inline)] pub use to_str::{ToStr, IntoStr}; +#[doc(no_inline)] pub use to_str::{ToString, IntoStr}; #[doc(no_inline)] pub use tuple::{Tuple1, Tuple2, Tuple3, Tuple4}; #[doc(no_inline)] pub use tuple::{Tuple5, Tuple6, Tuple7, Tuple8}; #[doc(no_inline)] pub use tuple::{Tuple9, Tuple10, Tuple11, Tuple12}; diff --git a/src/libstd/task.rs b/src/libstd/task.rs index e2d04a30a54bb..9f425a3177b6a 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -634,7 +634,7 @@ mod test { print!("Hello, world!"); }).unwrap(); - let output = reader.read_to_str().unwrap(); + let output = reader.read_to_string().unwrap(); assert_eq!(output, "Hello, world!".to_string()); } diff --git a/src/libstd/to_str.rs b/src/libstd/to_str.rs index 9a1c0151e5411..992cb6af4c12b 100644 --- a/src/libstd/to_str.rs +++ b/src/libstd/to_str.rs @@ -10,7 +10,7 @@ /*! -The `ToStr` trait for converting to strings +The `ToString` trait for converting to strings */ @@ -18,19 +18,19 @@ use fmt; use string::String; /// A generic trait for converting a value to a string -pub trait ToStr { +pub trait ToString { /// Converts the value of `self` to an owned string - fn to_str(&self) -> String; + fn to_string(&self) -> String; } /// Trait for converting a type to a string, consuming it in the process. pub trait IntoStr { /// Consume and convert to a string. - fn into_str(self) -> String; + fn into_string(self) -> String; } -impl ToStr for T { - fn to_str(&self) -> String { +impl ToString for T { + fn to_string(&self) -> String { format!("{}", *self) } } @@ -42,23 +42,23 @@ mod tests { #[test] fn test_simple_types() { - assert_eq!(1i.to_str(), "1".to_string()); - assert_eq!((-1i).to_str(), "-1".to_string()); - assert_eq!(200u.to_str(), "200".to_string()); - assert_eq!(2u8.to_str(), "2".to_string()); - assert_eq!(true.to_str(), "true".to_string()); - assert_eq!(false.to_str(), "false".to_string()); - assert_eq!(().to_str(), "()".to_string()); - assert_eq!(("hi".to_string()).to_str(), "hi".to_string()); + assert_eq!(1i.to_string(), "1".to_string()); + assert_eq!((-1i).to_string(), "-1".to_string()); + assert_eq!(200u.to_string(), "200".to_string()); + assert_eq!(2u8.to_string(), "2".to_string()); + assert_eq!(true.to_string(), "true".to_string()); + assert_eq!(false.to_string(), "false".to_string()); + assert_eq!(().to_string(), "()".to_string()); + assert_eq!(("hi".to_string()).to_string(), "hi".to_string()); } #[test] fn test_vectors() { let x: Vec = vec![]; - assert_eq!(x.to_str(), "[]".to_string()); - assert_eq!((vec![1]).to_str(), "[1]".to_string()); - assert_eq!((vec![1, 2, 3]).to_str(), "[1, 2, 3]".to_string()); - assert!((vec![vec![], vec![1], vec![1, 1]]).to_str() == + assert_eq!(x.to_string(), "[]".to_string()); + assert_eq!((vec![1]).to_string(), "[1]".to_string()); + assert_eq!((vec![1, 2, 3]).to_string(), "[1, 2, 3]".to_string()); + assert!((vec![vec![], vec![1], vec![1, 1]]).to_string() == "[[], [1], [1, 1]]".to_string()); } } diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index aeafc0e306c21..1a9ef4a2cf9f4 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -676,7 +676,7 @@ pub enum IntTy { impl fmt::Show for IntTy { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{}", - ast_util::int_ty_to_str(*self, None, ast_util::AutoSuffix)) + ast_util::int_ty_to_string(*self, None, ast_util::AutoSuffix)) } } @@ -692,7 +692,7 @@ pub enum UintTy { impl fmt::Show for UintTy { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{}", - ast_util::uint_ty_to_str(*self, None, ast_util::AutoSuffix)) + ast_util::uint_ty_to_string(*self, None, ast_util::AutoSuffix)) } } @@ -705,7 +705,7 @@ pub enum FloatTy { impl fmt::Show for FloatTy { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{}", ast_util::float_ty_to_str(*self)) + write!(f, "{}", ast_util::float_ty_to_string(*self)) } } diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs index 828e9ab12c251..013505fcb711d 100644 --- a/src/libsyntax/ast_map.rs +++ b/src/libsyntax/ast_map.rs @@ -250,7 +250,7 @@ impl Map { match abi { Some(abi) => abi, None => fail!("expected foreign mod or inlined parent, found {}", - self.node_to_str(parent)) + self.node_to_string(parent)) } } @@ -265,7 +265,7 @@ impl Map { pub fn expect_item(&self, id: NodeId) -> Gc { match self.find(id) { Some(NodeItem(item)) => item, - _ => fail!("expected item, found {}", self.node_to_str(id)) + _ => fail!("expected item, found {}", self.node_to_string(id)) } } @@ -283,21 +283,21 @@ impl Map { _ => fail!("struct ID bound to enum variant that isn't struct-like"), } } - _ => fail!(format!("expected struct, found {}", self.node_to_str(id))), + _ => fail!(format!("expected struct, found {}", self.node_to_string(id))), } } pub fn expect_variant(&self, id: NodeId) -> P { match self.find(id) { Some(NodeVariant(variant)) => variant, - _ => fail!(format!("expected variant, found {}", self.node_to_str(id))), + _ => fail!(format!("expected variant, found {}", self.node_to_string(id))), } } pub fn expect_foreign_item(&self, id: NodeId) -> Gc { match self.find(id) { Some(NodeForeignItem(item)) => item, - _ => fail!("expected foreign item, found {}", self.node_to_str(id)) + _ => fail!("expected foreign item, found {}", self.node_to_string(id)) } } @@ -326,13 +326,13 @@ impl Map { self.with_path_next(id, None, f) } - pub fn path_to_str(&self, id: NodeId) -> String { - self.with_path(id, |path| path_to_str(path)) + pub fn path_to_string(&self, id: NodeId) -> String { + self.with_path(id, |path| path_to_string(path)) } fn path_to_str_with_ident(&self, id: NodeId, i: Ident) -> String { self.with_path(id, |path| { - path_to_str(path.chain(Some(PathName(i.name)).move_iter())) + path_to_string(path.chain(Some(PathName(i.name)).move_iter())) }) } @@ -416,8 +416,8 @@ impl Map { .unwrap_or_else(|| fail!("AstMap.span: could not find span for id {}", id)) } - pub fn node_to_str(&self, id: NodeId) -> String { - node_id_to_str(self, id) + pub fn node_to_string(&self, id: NodeId) -> String { + node_id_to_string(self, id) } } @@ -664,7 +664,7 @@ pub fn map_decoded_item(map: &Map, ii } -fn node_id_to_str(map: &Map, id: NodeId) -> String { +fn node_id_to_string(map: &Map, id: NodeId) -> String { match map.find(id) { Some(NodeItem(item)) => { let path_str = map.path_to_str_with_ident(id, item.ident); @@ -689,49 +689,49 @@ fn node_id_to_str(map: &Map, id: NodeId) -> String { Some(NodeMethod(m)) => { (format!("method {} in {} (id={})", token::get_ident(m.ident), - map.path_to_str(id), id)).to_string() + map.path_to_string(id), id)).to_string() } Some(NodeTraitMethod(ref tm)) => { let m = ast_util::trait_method_to_ty_method(&**tm); (format!("method {} in {} (id={})", token::get_ident(m.ident), - map.path_to_str(id), id)).to_string() + map.path_to_string(id), id)).to_string() } Some(NodeVariant(ref variant)) => { (format!("variant {} in {} (id={})", token::get_ident(variant.node.name), - map.path_to_str(id), id)).to_string() + map.path_to_string(id), id)).to_string() } Some(NodeExpr(ref expr)) => { (format!("expr {} (id={})", - pprust::expr_to_str(&**expr), id)).to_string() + pprust::expr_to_string(&**expr), id)).to_string() } Some(NodeStmt(ref stmt)) => { (format!("stmt {} (id={})", - pprust::stmt_to_str(&**stmt), id)).to_string() + pprust::stmt_to_string(&**stmt), id)).to_string() } Some(NodeArg(ref pat)) => { (format!("arg {} (id={})", - pprust::pat_to_str(&**pat), id)).to_string() + pprust::pat_to_string(&**pat), id)).to_string() } Some(NodeLocal(ref pat)) => { (format!("local {} (id={})", - pprust::pat_to_str(&**pat), id)).to_string() + pprust::pat_to_string(&**pat), id)).to_string() } Some(NodePat(ref pat)) => { - (format!("pat {} (id={})", pprust::pat_to_str(&**pat), id)).to_string() + (format!("pat {} (id={})", pprust::pat_to_string(&**pat), id)).to_string() } Some(NodeBlock(ref block)) => { (format!("block {} (id={})", - pprust::block_to_str(&**block), id)).to_string() + pprust::block_to_string(&**block), id)).to_string() } Some(NodeStructCtor(_)) => { (format!("struct_ctor {} (id={})", - map.path_to_str(id), id)).to_string() + map.path_to_string(id), id)).to_string() } Some(NodeLifetime(ref l)) => { (format!("lifetime {} (id={})", - pprust::lifetime_to_str(&**l), id)).to_string() + pprust::lifetime_to_string(&**l), id)).to_string() } None => { (format!("unknown node (id={})", id)).to_string() diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index d28553da69173..e51df9b53ddbc 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -54,7 +54,7 @@ pub fn stmt_id(s: &Stmt) -> NodeId { } } -pub fn binop_to_str(op: BinOp) -> &'static str { +pub fn binop_to_string(op: BinOp) -> &'static str { match op { BiAdd => "+", BiSub => "-", @@ -93,7 +93,7 @@ pub fn is_shift_binop(b: BinOp) -> bool { } } -pub fn unop_to_str(op: UnOp) -> &'static str { +pub fn unop_to_string(op: UnOp) -> &'static str { match op { UnBox => "box(GC) ", UnUniq => "box() ", @@ -114,7 +114,7 @@ pub enum SuffixMode { // Get a string representation of a signed int type, with its value. // We want to avoid "45int" and "-3int" in favor of "45" and "-3" -pub fn int_ty_to_str(t: IntTy, val: Option, mode: SuffixMode) -> String { +pub fn int_ty_to_string(t: IntTy, val: Option, mode: SuffixMode) -> String { let s = match t { TyI if val.is_some() => match mode { AutoSuffix => "", @@ -147,7 +147,7 @@ pub fn int_ty_max(t: IntTy) -> u64 { // Get a string representation of an unsigned int type, with its value. // We want to avoid "42uint" in favor of "42u" -pub fn uint_ty_to_str(t: UintTy, val: Option, mode: SuffixMode) -> String { +pub fn uint_ty_to_string(t: UintTy, val: Option, mode: SuffixMode) -> String { let s = match t { TyU if val.is_some() => match mode { AutoSuffix => "", @@ -175,7 +175,7 @@ pub fn uint_ty_max(t: UintTy) -> u64 { } } -pub fn float_ty_to_str(t: FloatTy) -> String { +pub fn float_ty_to_string(t: FloatTy) -> String { match t { TyF32 => "f32".to_string(), TyF64 => "f64".to_string(), @@ -245,11 +245,11 @@ pub fn unguarded_pat(a: &Arm) -> Option>> { /// listed as `__extensions__::method_name::hash`, with no indication /// of the type). pub fn impl_pretty_name(trait_ref: &Option, ty: &Ty) -> Ident { - let mut pretty = pprust::ty_to_str(ty); + let mut pretty = pprust::ty_to_string(ty); match *trait_ref { Some(ref trait_ref) => { pretty.push_char('.'); - pretty.push_str(pprust::path_to_str(&trait_ref.path).as_slice()); + pretty.push_str(pprust::path_to_string(&trait_ref.path).as_slice()); } None => {} } diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index c917198e7d471..b3adf1daf418c 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -367,7 +367,7 @@ impl CodeMap { } } - pub fn span_to_str(&self, sp: Span) -> String { + pub fn span_to_string(&self, sp: Span) -> String { if self.files.borrow().len() == 0 && sp == DUMMY_SP { return "no-location".to_string(); } @@ -687,7 +687,7 @@ mod test { // Test span_to_str for a span ending at the end of filemap let cm = init_code_map(); let span = Span {lo: BytePos(12), hi: BytePos(23), expn_info: None}; - let sstr = cm.span_to_str(span); + let sstr = cm.span_to_string(span); assert_eq!(sstr, "blork.rs:2:1: 2:12".to_string()); } diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index 16c463f0c96ff..b27ce5c5cca9e 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -268,7 +268,7 @@ fn print_diagnostic(dst: &mut EmitterWriter, } try!(print_maybe_styled(dst, - format!("{}: ", lvl.to_str()).as_slice(), + format!("{}: ", lvl.to_string()).as_slice(), term::attr::ForegroundColor(lvl.color()))); try!(print_maybe_styled(dst, format!("{}\n", msg).as_slice(), @@ -348,14 +348,14 @@ impl Emitter for EmitterWriter { fn emit(dst: &mut EmitterWriter, cm: &codemap::CodeMap, rsp: RenderSpan, msg: &str, lvl: Level, custom: bool) -> io::IoResult<()> { let sp = rsp.span(); - let ss = cm.span_to_str(sp); + let ss = cm.span_to_string(sp); let lines = cm.span_to_lines(sp); if custom { // we want to tell compiletest/runtest to look at the last line of the // span (since `custom_highlight_lines` displays an arrow to the end of // the span) let span_end = Span { lo: sp.hi, hi: sp.hi, expn_info: sp.expn_info}; - let ses = cm.span_to_str(span_end); + let ses = cm.span_to_string(span_end); try!(print_diagnostic(dst, ses.as_slice(), lvl, msg)); if rsp.is_full_span() { try!(custom_highlight_lines(dst, cm, sp, lvl, lines)); @@ -492,7 +492,7 @@ fn print_macro_backtrace(w: &mut EmitterWriter, let ss = ei.callee .span .as_ref() - .map_or("".to_string(), |span| cm.span_to_str(*span)); + .map_or("".to_string(), |span| cm.span_to_string(*span)); let (pre, post) = match ei.callee.format { codemap::MacroAttribute => ("#[", "]"), codemap::MacroBang => ("", "!") @@ -501,7 +501,7 @@ fn print_macro_backtrace(w: &mut EmitterWriter, format!("in expansion of {}{}{}", pre, ei.callee.name, post).as_slice())); - let ss = cm.span_to_str(ei.call_site); + let ss = cm.span_to_string(ei.call_site); try!(print_diagnostic(w, ss.as_slice(), Note, "expansion site")); try!(print_macro_backtrace(w, cm, ei.call_site)); } diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 50b1639484d94..0e2c74fad5f23 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -70,7 +70,7 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) 'statement: loop { match state { Asm => { - let (s, style) = match expr_to_str(cx, p.parse_expr(), + let (s, style) = match expr_to_string(cx, p.parse_expr(), "inline assembly must be a string literal.") { Some((s, st)) => (s, st), // let compilation continue @@ -211,7 +211,7 @@ pub fn expand_asm(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) // Append an input operand, with the form of ("0", expr) // that links to an output operand. for &(i, out) in read_write_operands.iter() { - inputs.push((token::intern_and_get_ident(i.to_str().as_slice()), + inputs.push((token::intern_and_get_ident(i.to_string().as_slice()), out)); } diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 960894e69636a..458cbd5cf4bbb 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -529,7 +529,7 @@ impl<'a> ExtCtxt<'a> { /// Extract a string literal from the macro expanded version of `expr`, /// emitting `err_msg` if `expr` is not a string literal. This does not stop /// compilation on error, merely emits a non-fatal error and returns None. -pub fn expr_to_str(cx: &mut ExtCtxt, expr: Gc, err_msg: &str) +pub fn expr_to_string(cx: &mut ExtCtxt, expr: Gc, err_msg: &str) -> Option<(InternedString, ast::StrStyle)> { // we want to be able to handle e.g. concat("foo", "bar") let expr = cx.expand_expr(expr); diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs index 9ef7241ca2484..b24cfb85794ed 100644 --- a/src/libsyntax/ext/env.rs +++ b/src/libsyntax/ext/env.rs @@ -70,7 +70,7 @@ pub fn expand_env(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) Some(exprs) => exprs }; - let var = match expr_to_str(cx, + let var = match expr_to_string(cx, *exprs.get(0), "expected string literal") { None => return DummyResult::expr(sp), @@ -83,7 +83,7 @@ pub fn expand_env(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) var).as_slice()) } 2 => { - match expr_to_str(cx, *exprs.get(1), "expected string literal") { + match expr_to_string(cx, *exprs.get(1), "expected string literal") { None => return DummyResult::expr(sp), Some((s, _style)) => s } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index fb2de2e271a99..eadde68651468 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1166,7 +1166,7 @@ mod test { //} //fn expand_and_resolve_and_pretty_print (crate_str: @str) -> String { //let resolved_ast = expand_and_resolve(crate_str); - //pprust::to_str(&resolved_ast,fake_print_crate,get_ident_interner()) + //pprust::to_string(&resolved_ast,fake_print_crate,get_ident_interner()) //} #[test] fn macro_tokens_should_match(){ @@ -1301,7 +1301,7 @@ mod test { } #[test] fn fmt_in_macro_used_inside_module_macro() { - let crate_str = "macro_rules! fmt_wrap(($b:expr)=>($b.to_str())) + 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(); diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 857eadfe57cc4..4b1e2e7d4b8a2 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -131,7 +131,7 @@ fn parse_args(ecx: &mut ExtCtxt, sp: Span, allow_method: bool, _ => { ecx.span_err(p.span, format!("expected ident for named argument, but found `{}`", - p.this_token_to_str()).as_slice()); + p.this_token_to_string()).as_slice()); return (invocation, None); } }; @@ -695,7 +695,7 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt, sp: Span, fmtsp: sp, }; cx.fmtsp = efmt.span; - let fmt = match expr_to_str(cx.ecx, + let fmt = match expr_to_string(cx.ecx, efmt, "format argument must be a string literal.") { Some((fmt, _)) => fmt, diff --git a/src/libsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs index 486d060da77be..1f4d087abd0fe 100644 --- a/src/libsyntax/ext/log_syntax.rs +++ b/src/libsyntax/ext/log_syntax.rs @@ -21,7 +21,7 @@ pub fn expand_syntax_ext(cx: &mut base::ExtCtxt, -> Box { cx.print_backtrace(); - println!("{}", print::pprust::tt_to_str(&ast::TTDelim( + println!("{}", print::pprust::tt_to_string(&ast::TTDelim( Rc::new(tt.iter().map(|x| (*x).clone()).collect())))); // any so that `log_syntax` can be invoked as an expression and item. diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 407715ab4dae0..51f8a43d43de2 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -81,7 +81,7 @@ pub mod rt { impl ToSource for Gc { fn to_source(&self) -> String { - pprust::item_to_str(&**self) + pprust::item_to_string(&**self) } } @@ -97,7 +97,7 @@ pub mod rt { impl ToSource for ast::Ty { fn to_source(&self) -> String { - pprust::ty_to_str(self) + pprust::ty_to_string(self) } } @@ -113,25 +113,25 @@ pub mod rt { impl ToSource for Generics { fn to_source(&self) -> String { - pprust::generics_to_str(self) + pprust::generics_to_string(self) } } impl ToSource for Gc { fn to_source(&self) -> String { - pprust::expr_to_str(&**self) + pprust::expr_to_string(&**self) } } impl ToSource for ast::Block { fn to_source(&self) -> String { - pprust::block_to_str(self) + pprust::block_to_string(self) } } impl ToSource for ast::Arg { fn to_source(&self) -> String { - pprust::arg_to_str(self) + pprust::arg_to_string(self) } } @@ -139,7 +139,7 @@ pub mod rt { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitStr( token::intern_and_get_ident(*self), ast::CookedStr)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } @@ -152,35 +152,35 @@ pub mod rt { impl ToSource for bool { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitBool(*self)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for char { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitChar(*self)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for int { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitInt(*self as i64, ast::TyI)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for i8 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitInt(*self as i64, ast::TyI8)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for i16 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitInt(*self as i64, ast::TyI16)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } @@ -188,49 +188,49 @@ pub mod rt { impl ToSource for i32 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitInt(*self as i64, ast::TyI32)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for i64 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitInt(*self as i64, ast::TyI64)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for uint { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitUint(*self as u64, ast::TyU)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for u8 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitUint(*self as u64, ast::TyU8)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for u16 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitUint(*self as u64, ast::TyU16)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for u32 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitUint(*self as u64, ast::TyU32)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } impl ToSource for u64 { fn to_source(&self) -> String { let lit = dummy_spanned(ast::LitUint(*self as u64, ast::TyU64)); - pprust::lit_to_str(&lit) + pprust::lit_to_string(&lit) } } diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 915fc16c15660..8922f423aad31 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -64,7 +64,7 @@ pub fn expand_file(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) pub fn expand_stringify(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> Box { - let s = pprust::tts_to_str(tts); + let s = pprust::tts_to_string(tts); base::MacExpr::new(cx.expr_str(sp, token::intern_and_get_ident(s.as_slice()))) } @@ -126,7 +126,7 @@ pub fn expand_include_str(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) Some(src) => { // Add this input file to the code map to make it available as // dependency information - let filename = file.display().to_str(); + let filename = file.display().to_string(); let interned = token::intern_and_get_ident(src); cx.codemap().new_filemap(filename, src.to_string()); diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 86fbc8cec2a34..913e0427bda22 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -395,7 +395,7 @@ pub fn parse(sess: &ParseSess, nts, next_eis.len()).to_string()); } else if bb_eis.len() == 0u && next_eis.len() == 0u { return Failure(sp, format!("no rules expected the token `{}`", - token::to_str(&tok)).to_string()); + token::to_string(&tok)).to_string()); } else if next_eis.len() > 0u { /* Now process the next token */ while next_eis.len() > 0u { @@ -442,7 +442,7 @@ pub fn parse_nt(p: &mut Parser, name: &str) -> Nonterminal { "ident" => match p.token { token::IDENT(sn,b) => { p.bump(); token::NtIdent(box sn,b) } _ => { - let token_str = token::to_str(&p.token); + let token_str = token::to_string(&p.token); p.fatal((format!("expected ident, found {}", token_str.as_slice())).as_slice()) } diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 72c578b87699c..2b481cb0596e7 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -48,7 +48,7 @@ impl<'a> ParserAnyMacro<'a> { parser.bump() } if parser.token != EOF { - let token_str = parser.this_token_to_str(); + let token_str = parser.this_token_to_string(); let msg = format!("macro expansion ignores token `{}` and any \ following", token_str); @@ -131,7 +131,7 @@ fn generic_extension(cx: &ExtCtxt, println!("{}! {} {} {}", token::get_ident(name), "{", - print::pprust::tt_to_str(&TTDelim(Rc::new(arg.iter() + print::pprust::tt_to_string(&TTDelim(Rc::new(arg.iter() .map(|x| (*x).clone()) .collect()))), "}"); @@ -254,7 +254,7 @@ pub fn add_new_extension(cx: &mut ExtCtxt, box MacroRulesDefiner { def: RefCell::new(Some(MacroDef { - name: token::get_ident(name).to_str(), + name: token::get_ident(name).to_string(), ext: NormalTT(exp, Some(sp)) })) } as Box diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 6d2b0ceed8bf7..a28c7019a5af9 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -989,7 +989,7 @@ mod test { assert_pred!( matches_codepattern, "matches_codepattern", - pprust::to_str(|s| fake_print_crate(s, &folded_crate)), + 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()); } @@ -1003,7 +1003,7 @@ mod test { assert_pred!( matches_codepattern, "matches_codepattern", - pprust::to_str(|s| fake_print_crate(s, &folded_crate)), + 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()); } } diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs index e47080dadfd72..53489e3283766 100644 --- a/src/libsyntax/parse/attr.rs +++ b/src/libsyntax/parse/attr.rs @@ -91,7 +91,7 @@ impl<'a> ParserAttr for Parser<'a> { (mk_sp(lo, hi), meta_item, style) } _ => { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected `#` but found `{}`", token_str).as_slice()); } diff --git a/src/libsyntax/parse/lexer/comments.rs b/src/libsyntax/parse/lexer/comments.rs index a009955f91a7b..79c2ea2be82f6 100644 --- a/src/libsyntax/parse/lexer/comments.rs +++ b/src/libsyntax/parse/lexer/comments.rs @@ -369,7 +369,7 @@ pub fn gather_comments_and_literals(span_diagnostic: &diagnostic::SpanHandler, literals.push(Literal {lit: s.to_string(), pos: sp.lo}); }) } else { - debug!("tok: {}", token::to_str(&tok)); + debug!("tok: {}", token::to_string(&tok)); } first_read = false; } diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b56919c53c758..f1c38f1875f11 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -362,24 +362,24 @@ impl<'a> Parser<'a> { } } // convert a token to a string using self's reader - pub fn token_to_str(token: &token::Token) -> String { - token::to_str(token) + pub fn token_to_string(token: &token::Token) -> String { + token::to_string(token) } // convert the current token to a string using self's reader - pub fn this_token_to_str(&mut self) -> String { - Parser::token_to_str(&self.token) + pub fn this_token_to_string(&mut self) -> String { + Parser::token_to_string(&self.token) } pub fn unexpected_last(&mut self, t: &token::Token) -> ! { - let token_str = Parser::token_to_str(t); + let token_str = Parser::token_to_string(t); let last_span = self.last_span; self.span_fatal(last_span, format!("unexpected token: `{}`", token_str).as_slice()); } pub fn unexpected(&mut self) -> ! { - let this_token = self.this_token_to_str(); + let this_token = self.this_token_to_string(); self.fatal(format!("unexpected token: `{}`", this_token).as_slice()); } @@ -389,8 +389,8 @@ impl<'a> Parser<'a> { if self.token == *t { self.bump(); } else { - let token_str = Parser::token_to_str(t); - let this_token_str = self.this_token_to_str(); + let token_str = Parser::token_to_string(t); + let this_token_str = self.this_token_to_string(); self.fatal(format!("expected `{}` but found `{}`", token_str, this_token_str).as_slice()) @@ -403,15 +403,15 @@ impl<'a> Parser<'a> { pub fn expect_one_of(&mut self, edible: &[token::Token], inedible: &[token::Token]) { - fn tokens_to_str(tokens: &[token::Token]) -> String { + fn tokens_to_string(tokens: &[token::Token]) -> String { let mut i = tokens.iter(); // This might be a sign we need a connect method on Iterator. let b = i.next() - .map_or("".to_string(), |t| Parser::token_to_str(t)); + .map_or("".to_string(), |t| Parser::token_to_string(t)); i.fold(b, |b,a| { let mut b = b; b.push_str("`, `"); - b.push_str(Parser::token_to_str(a).as_slice()); + b.push_str(Parser::token_to_string(a).as_slice()); b }) } @@ -421,8 +421,8 @@ impl<'a> Parser<'a> { // leave it in the input } else { let expected = edible.iter().map(|x| (*x).clone()).collect::>().append(inedible); - let expect = tokens_to_str(expected.as_slice()); - let actual = self.this_token_to_str(); + let expect = tokens_to_string(expected.as_slice()); + let actual = self.this_token_to_string(); self.fatal( (if expected.len() != 1 { (format!("expected one of `{}` but found `{}`", @@ -511,7 +511,7 @@ impl<'a> Parser<'a> { self.bug("ident interpolation not converted to real token"); } _ => { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal((format!("expected ident, found `{}`", token_str)).as_slice()) } @@ -555,7 +555,7 @@ impl<'a> Parser<'a> { pub fn expect_keyword(&mut self, kw: keywords::Keyword) { if !self.eat_keyword(kw) { let id_interned_str = token::get_ident(kw.to_ident()); - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected `{}`, found `{}`", id_interned_str, token_str).as_slice()) } @@ -564,7 +564,7 @@ impl<'a> Parser<'a> { // signal an error if the given string is a strict keyword pub fn check_strict_keywords(&mut self) { if token::is_strict_keyword(&self.token) { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); let span = self.span; self.span_err(span, format!("found `{}` in ident position", @@ -575,7 +575,7 @@ impl<'a> Parser<'a> { // signal an error if the current token is a reserved keyword pub fn check_reserved_keywords(&mut self) { if token::is_reserved_keyword(&self.token) { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("`{}` is a reserved keyword", token_str).as_slice()) } @@ -592,9 +592,9 @@ impl<'a> Parser<'a> { self.replace_token(token::BINOP(token::AND), lo, span.hi) } _ => { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); let found_token = - Parser::token_to_str(&token::BINOP(token::AND)); + Parser::token_to_string(&token::BINOP(token::AND)); self.fatal(format!("expected `{}`, found `{}`", found_token, token_str).as_slice()) @@ -613,9 +613,9 @@ impl<'a> Parser<'a> { self.replace_token(token::BINOP(token::OR), lo, span.hi) } _ => { - let found_token = self.this_token_to_str(); + let found_token = self.this_token_to_string(); let token_str = - Parser::token_to_str(&token::BINOP(token::OR)); + Parser::token_to_string(&token::BINOP(token::OR)); self.fatal(format!("expected `{}`, found `{}`", token_str, found_token).as_slice()) @@ -666,8 +666,8 @@ impl<'a> Parser<'a> { fn expect_lt(&mut self) { if !self.eat_lt(true) { - let found_token = self.this_token_to_str(); - let token_str = Parser::token_to_str(&token::LT); + let found_token = self.this_token_to_string(); + let token_str = Parser::token_to_string(&token::LT); self.fatal(format!("expected `{}`, found `{}`", token_str, found_token).as_slice()) @@ -717,8 +717,8 @@ impl<'a> Parser<'a> { self.replace_token(token::EQ, lo, span.hi) } _ => { - let gt_str = Parser::token_to_str(&token::GT); - let this_token_str = self.this_token_to_str(); + let gt_str = Parser::token_to_string(&token::GT); + let this_token_str = self.this_token_to_string(); self.fatal(format!("expected `{}`, found `{}`", gt_str, this_token_str).as_slice()) @@ -1246,7 +1246,7 @@ impl<'a> Parser<'a> { } _ => { - let token_str = p.this_token_to_str(); + let token_str = p.this_token_to_string(); p.fatal((format!("expected `;` or `{{` but found `{}`", token_str)).as_slice()) } @@ -2198,7 +2198,7 @@ impl<'a> Parser<'a> { None => {} Some(&sp) => p.span_note(sp, "unclosed delimiter"), }; - let token_str = p.this_token_to_str(); + let token_str = p.this_token_to_string(); p.fatal(format!("incorrect close delimiter: `{}`", token_str).as_slice()) }, @@ -2798,7 +2798,7 @@ impl<'a> Parser<'a> { if self.token == token::DOTDOT { self.bump(); if self.token != token::RBRACE { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected `{}`, found `{}`", "}", token_str).as_slice()) } @@ -2819,7 +2819,7 @@ impl<'a> Parser<'a> { let subpat = if self.token == token::COLON { match bind_type { BindByRef(..) | BindByValue(MutMutable) => { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("unexpected `{}`", token_str).as_slice()) } @@ -3223,7 +3223,7 @@ impl<'a> Parser<'a> { } else { "" }; - let tok_str = self.this_token_to_str(); + let tok_str = self.this_token_to_string(); self.fatal(format!("expected {}`(` or `{{`, but found `{}`", ident_str, tok_str).as_slice()) @@ -3684,7 +3684,7 @@ impl<'a> Parser<'a> { fn expect_self_ident(&mut self) { if !self.is_self_ident() { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected `self` but found `{}`", token_str).as_slice()) } @@ -3817,7 +3817,7 @@ impl<'a> Parser<'a> { vec!(Arg::new_self(explicit_self_sp, mutbl_self)) } _ => { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected `,` or `)`, found `{}`", token_str).as_slice()) } @@ -3986,7 +3986,7 @@ impl<'a> Parser<'a> { // Parses two variants (with the region/type params always optional): // impl Foo { ... } - // impl ToStr for ~[T] { ... } + // impl ToString for ~[T] { ... } fn parse_item_impl(&mut self) -> ItemInfo { // First, parse type parameters if necessary. let generics = self.parse_generics(); @@ -4116,7 +4116,7 @@ impl<'a> Parser<'a> { is_tuple_like = true; fields = Vec::new(); } else { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected `{}`, `(`, or `;` after struct \ name but found `{}`", "{", token_str).as_slice()) @@ -4147,7 +4147,7 @@ impl<'a> Parser<'a> { token::RBRACE => {} _ => { let span = self.span; - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.span_fatal(span, format!("expected `,`, or `}}` but found `{}`", token_str).as_slice()) @@ -4230,7 +4230,7 @@ impl<'a> Parser<'a> { the module"); } _ => { - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.fatal(format!("expected item but found `{}`", token_str).as_slice()) } @@ -4510,7 +4510,7 @@ impl<'a> Parser<'a> { } _ => { let span = self.span; - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.span_fatal(span, format!("expected extern crate name but \ found `{}`", @@ -4768,7 +4768,7 @@ impl<'a> Parser<'a> { } let span = self.span; - let token_str = self.this_token_to_str(); + let token_str = self.this_token_to_string(); self.span_fatal(span, format!("expected `{}` or `fn` but found `{}`", "{", token_str).as_slice()); diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index a2af417ed79a8..d963bb9fb983e 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -139,7 +139,7 @@ impl fmt::Show for Nonterminal { } } -pub fn binop_to_str(o: BinOp) -> &'static str { +pub fn binop_to_string(o: BinOp) -> &'static str { match o { PLUS => "+", MINUS => "-", @@ -154,7 +154,7 @@ pub fn binop_to_str(o: BinOp) -> &'static str { } } -pub fn to_str(t: &Token) -> String { +pub fn to_string(t: &Token) -> String { match *t { EQ => "=".to_string(), LT => "<".to_string(), @@ -167,9 +167,9 @@ pub fn to_str(t: &Token) -> String { TILDE => "~".to_string(), OROR => "||".to_string(), ANDAND => "&&".to_string(), - BINOP(op) => binop_to_str(op).to_string(), + BINOP(op) => binop_to_string(op).to_string(), BINOPEQ(op) => { - let mut s = binop_to_str(op).to_string(); + let mut s = binop_to_string(op).to_string(); s.push_str("="); s } @@ -212,17 +212,17 @@ pub fn to_str(t: &Token) -> String { res.push_char('\''); res } - LIT_INT(i, t) => ast_util::int_ty_to_str(t, Some(i), + LIT_INT(i, t) => ast_util::int_ty_to_string(t, Some(i), ast_util::ForceSuffix), - LIT_UINT(u, t) => ast_util::uint_ty_to_str(t, Some(u), + LIT_UINT(u, t) => ast_util::uint_ty_to_string(t, Some(u), ast_util::ForceSuffix), - LIT_INT_UNSUFFIXED(i) => { (i as u64).to_str() } + LIT_INT_UNSUFFIXED(i) => { (i as u64).to_string() } LIT_FLOAT(s, t) => { let mut body = String::from_str(get_ident(s).get()); if body.as_slice().ends_with(".") { body.push_char('0'); // `10.f` is not a float literal } - body.push_str(ast_util::float_ty_to_str(t).as_slice()); + body.push_str(ast_util::float_ty_to_string(t).as_slice()); body } LIT_FLOAT_UNSUFFIXED(s) => { @@ -261,8 +261,8 @@ pub fn to_str(t: &Token) -> String { EOF => "".to_string(), INTERPOLATED(ref nt) => { match nt { - &NtExpr(ref e) => ::print::pprust::expr_to_str(&**e), - &NtMeta(ref e) => ::print::pprust::meta_item_to_str(&**e), + &NtExpr(ref e) => ::print::pprust::expr_to_string(&**e), + &NtMeta(ref e) => ::print::pprust::meta_item_to_string(&**e), _ => { let mut s = "an interpolated ".to_string(); match *nt { @@ -692,7 +692,7 @@ pub fn gensym_ident(s: &str) -> ast::Ident { } // create a fresh name that maps to the same string as the old one. -// note that this guarantees that str_ptr_eq(ident_to_str(src),interner_get(fresh_name(src))); +// note that this guarantees that str_ptr_eq(ident_to_string(src),interner_get(fresh_name(src))); // that is, that the new name and the old one are connected to ptr_eq strings. pub fn fresh_name(src: &ast::Ident) -> Name { let interner = get_ident_interner(); @@ -701,7 +701,7 @@ pub fn fresh_name(src: &ast::Ident) -> Name { // good error messages and uses of struct names in ambiguous could-be-binding // locations. Also definitely destroys the guarantee given above about ptr_eq. /*let num = rand::task_rng().gen_uint_range(0,0xffff); - gensym(format!("{}_{}",ident_to_str(src),num))*/ + gensym(format!("{}_{}",ident_to_string(src),num))*/ } // create a fresh mark. diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index fafebd3c5dc3e..73fdf73a752f5 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -128,7 +128,7 @@ pub fn print_crate<'a>(cm: &'a CodeMap, eof(&mut s.s) } -pub fn to_str(f: |&mut State| -> IoResult<()>) -> String { +pub fn to_string(f: |&mut State| -> IoResult<()>) -> String { let mut s = rust_printer(box MemWriter::new()); f(&mut s).unwrap(); eof(&mut s.s).unwrap(); @@ -144,62 +144,62 @@ pub fn to_str(f: |&mut State| -> IoResult<()>) -> String { } } -pub fn ty_to_str(ty: &ast::Ty) -> String { - to_str(|s| s.print_type(ty)) +pub fn ty_to_string(ty: &ast::Ty) -> String { + to_string(|s| s.print_type(ty)) } -pub fn pat_to_str(pat: &ast::Pat) -> String { - to_str(|s| s.print_pat(pat)) +pub fn pat_to_string(pat: &ast::Pat) -> String { + to_string(|s| s.print_pat(pat)) } -pub fn expr_to_str(e: &ast::Expr) -> String { - to_str(|s| s.print_expr(e)) +pub fn expr_to_string(e: &ast::Expr) -> String { + to_string(|s| s.print_expr(e)) } -pub fn lifetime_to_str(e: &ast::Lifetime) -> String { - to_str(|s| s.print_lifetime(e)) +pub fn lifetime_to_string(e: &ast::Lifetime) -> String { + to_string(|s| s.print_lifetime(e)) } -pub fn tt_to_str(tt: &ast::TokenTree) -> String { - to_str(|s| s.print_tt(tt)) +pub fn tt_to_string(tt: &ast::TokenTree) -> String { + to_string(|s| s.print_tt(tt)) } -pub fn tts_to_str(tts: &[ast::TokenTree]) -> String { - to_str(|s| s.print_tts(tts)) +pub fn tts_to_string(tts: &[ast::TokenTree]) -> String { + to_string(|s| s.print_tts(tts)) } -pub fn stmt_to_str(stmt: &ast::Stmt) -> String { - to_str(|s| s.print_stmt(stmt)) +pub fn stmt_to_string(stmt: &ast::Stmt) -> String { + to_string(|s| s.print_stmt(stmt)) } -pub fn item_to_str(i: &ast::Item) -> String { - to_str(|s| s.print_item(i)) +pub fn item_to_string(i: &ast::Item) -> String { + to_string(|s| s.print_item(i)) } -pub fn generics_to_str(generics: &ast::Generics) -> String { - to_str(|s| s.print_generics(generics)) +pub fn generics_to_string(generics: &ast::Generics) -> String { + to_string(|s| s.print_generics(generics)) } -pub fn ty_method_to_str(p: &ast::TypeMethod) -> String { - to_str(|s| s.print_ty_method(p)) +pub fn ty_method_to_string(p: &ast::TypeMethod) -> String { + to_string(|s| s.print_ty_method(p)) } -pub fn method_to_str(p: &ast::Method) -> String { - to_str(|s| s.print_method(p)) +pub fn method_to_string(p: &ast::Method) -> String { + to_string(|s| s.print_method(p)) } -pub fn fn_block_to_str(p: &ast::FnDecl) -> String { - to_str(|s| s.print_fn_block_args(p)) +pub fn fn_block_to_string(p: &ast::FnDecl) -> String { + to_string(|s| s.print_fn_block_args(p)) } -pub fn path_to_str(p: &ast::Path) -> String { - to_str(|s| s.print_path(p, false)) +pub fn path_to_string(p: &ast::Path) -> String { + to_string(|s| s.print_path(p, false)) } -pub fn fun_to_str(decl: &ast::FnDecl, fn_style: ast::FnStyle, name: ast::Ident, +pub fn fun_to_string(decl: &ast::FnDecl, fn_style: ast::FnStyle, name: ast::Ident, opt_explicit_self: Option, generics: &ast::Generics) -> String { - to_str(|s| { + to_string(|s| { try!(s.print_fn(decl, Some(fn_style), abi::Rust, name, generics, opt_explicit_self, ast::Inherited)); try!(s.end()); // Close the head box @@ -207,8 +207,8 @@ pub fn fun_to_str(decl: &ast::FnDecl, fn_style: ast::FnStyle, name: ast::Ident, }) } -pub fn block_to_str(blk: &ast::Block) -> String { - to_str(|s| { +pub fn block_to_string(blk: &ast::Block) -> String { + to_string(|s| { // containing cbox, will be closed by print-block at } try!(s.cbox(indent_unit)); // head-ibox, will be closed by print-block after { @@ -217,28 +217,28 @@ pub fn block_to_str(blk: &ast::Block) -> String { }) } -pub fn meta_item_to_str(mi: &ast::MetaItem) -> String { - to_str(|s| s.print_meta_item(mi)) +pub fn meta_item_to_string(mi: &ast::MetaItem) -> String { + to_string(|s| s.print_meta_item(mi)) } -pub fn attribute_to_str(attr: &ast::Attribute) -> String { - to_str(|s| s.print_attribute(attr)) +pub fn attribute_to_string(attr: &ast::Attribute) -> String { + to_string(|s| s.print_attribute(attr)) } -pub fn lit_to_str(l: &ast::Lit) -> String { - to_str(|s| s.print_literal(l)) +pub fn lit_to_string(l: &ast::Lit) -> String { + to_string(|s| s.print_literal(l)) } -pub fn explicit_self_to_str(explicit_self: ast::ExplicitSelf_) -> String { - to_str(|s| s.print_explicit_self(explicit_self, ast::MutImmutable).map(|_| {})) +pub fn explicit_self_to_string(explicit_self: ast::ExplicitSelf_) -> String { + to_string(|s| s.print_explicit_self(explicit_self, ast::MutImmutable).map(|_| {})) } -pub fn variant_to_str(var: &ast::Variant) -> String { - to_str(|s| s.print_variant(var)) +pub fn variant_to_string(var: &ast::Variant) -> String { + to_string(|s| s.print_variant(var)) } -pub fn arg_to_str(arg: &ast::Arg) -> String { - to_str(|s| s.print_arg(arg)) +pub fn arg_to_string(arg: &ast::Arg) -> String { + to_string(|s| s.print_arg(arg)) } pub fn visibility_qualified(vis: ast::Visibility, s: &str) -> String { @@ -666,7 +666,7 @@ impl<'a> State<'a> { } ast::ItemForeignMod(ref nmod) => { try!(self.head("extern")); - try!(self.word_nbsp(nmod.abi.to_str().as_slice())); + try!(self.word_nbsp(nmod.abi.to_string().as_slice())); try!(self.bopen()); try!(self.print_foreign_mod(nmod, item.attrs.as_slice())); try!(self.bclose(item.span)); @@ -885,7 +885,7 @@ impl<'a> State<'a> { match *tt { ast::TTDelim(ref tts) => self.print_tts(tts.as_slice()), ast::TTTok(_, ref tk) => { - try!(word(&mut self.s, parse::token::to_str(tk).as_slice())); + try!(word(&mut self.s, parse::token::to_string(tk).as_slice())); match *tk { parse::token::DOC_COMMENT(..) => { hardbreak(&mut self.s) @@ -902,7 +902,7 @@ impl<'a> State<'a> { match *sep { Some(ref tk) => { try!(word(&mut self.s, - parse::token::to_str(tk).as_slice())); + parse::token::to_string(tk).as_slice())); } None => () } @@ -1300,11 +1300,11 @@ impl<'a> State<'a> { ast::ExprBinary(op, ref lhs, ref rhs) => { try!(self.print_expr(&**lhs)); try!(space(&mut self.s)); - try!(self.word_space(ast_util::binop_to_str(op))); + try!(self.word_space(ast_util::binop_to_string(op))); try!(self.print_expr(&**rhs)); } ast::ExprUnary(op, ref expr) => { - try!(word(&mut self.s, ast_util::unop_to_str(op))); + try!(word(&mut self.s, ast_util::unop_to_string(op))); try!(self.print_expr_maybe_paren(&**expr)); } ast::ExprAddrOf(m, ref expr) => { @@ -1480,7 +1480,7 @@ impl<'a> State<'a> { ast::ExprAssignOp(op, ref lhs, ref rhs) => { try!(self.print_expr(&**lhs)); try!(space(&mut self.s)); - try!(word(&mut self.s, ast_util::binop_to_str(op))); + try!(word(&mut self.s, ast_util::binop_to_string(op))); try!(self.word_space("=")); try!(self.print_expr(&**rhs)); } @@ -2319,12 +2319,12 @@ impl<'a> State<'a> { } ast::LitInt(i, t) => { word(&mut self.s, - ast_util::int_ty_to_str(t, Some(i), + ast_util::int_ty_to_string(t, Some(i), ast_util::AutoSuffix).as_slice()) } ast::LitUint(u, t) => { word(&mut self.s, - ast_util::uint_ty_to_str(t, Some(u), + ast_util::uint_ty_to_string(t, Some(u), ast_util::ForceSuffix).as_slice()) } ast::LitIntUnsuffixed(i) => { @@ -2335,7 +2335,7 @@ impl<'a> State<'a> { format!( "{}{}", f.get(), - ast_util::float_ty_to_str(t).as_slice()).as_slice()) + ast_util::float_ty_to_string(t).as_slice()).as_slice()) } ast::LitFloatUnsuffixed(ref f) => word(&mut self.s, f.get()), ast::LitNil => word(&mut self.s, "()"), @@ -2473,7 +2473,7 @@ impl<'a> State<'a> { Some(abi::Rust) => Ok(()), Some(abi) => { try!(self.word_nbsp("extern")); - self.word_nbsp(abi.to_str().as_slice()) + self.word_nbsp(abi.to_string().as_slice()) } None => Ok(()) } @@ -2484,7 +2484,7 @@ impl<'a> State<'a> { match opt_abi { Some(abi) => { try!(self.word_nbsp("extern")); - self.word_nbsp(abi.to_str().as_slice()) + self.word_nbsp(abi.to_string().as_slice()) } None => Ok(()) } @@ -2500,7 +2500,7 @@ impl<'a> State<'a> { if abi != abi::Rust { try!(self.word_nbsp("extern")); - try!(self.word_nbsp(abi.to_str().as_slice())); + try!(self.word_nbsp(abi.to_string().as_slice())); } word(&mut self.s, "fn") @@ -2531,7 +2531,7 @@ mod test { use parse::token; #[test] - fn test_fun_to_str() { + fn test_fun_to_string() { let abba_ident = token::str_to_ident("abba"); let decl = ast::FnDecl { @@ -2543,13 +2543,13 @@ mod test { variadic: false }; let generics = ast_util::empty_generics(); - assert_eq!(&fun_to_str(&decl, ast::NormalFn, abba_ident, + assert_eq!(&fun_to_string(&decl, ast::NormalFn, abba_ident, None, &generics), &"fn abba()".to_string()); } #[test] - fn test_variant_to_str() { + fn test_variant_to_string() { let ident = token::str_to_ident("principal_skinner"); let var = codemap::respan(codemap::DUMMY_SP, ast::Variant_ { @@ -2562,7 +2562,7 @@ mod test { vis: ast::Public, }); - let varstr = variant_to_str(&var); + let varstr = variant_to_string(&var); assert_eq!(&varstr,&"pub principal_skinner".to_string()); } } diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 4df8cfdd490ee..ec2b285a1dd26 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -368,7 +368,7 @@ pub fn parse_opts(args: &[String]) -> Option { let matches = match getopts::getopts(args_.as_slice(), optgroups().as_slice()) { Ok(m) => m, - Err(f) => return Some(Err(f.to_str())) + Err(f) => return Some(Err(f.to_string())) }; if matches.opt_present("h") { usage(args[0].as_slice()); return None; } @@ -632,7 +632,7 @@ impl ConsoleTestState { let mut failures = Vec::new(); let mut fail_out = String::new(); for &(ref f, ref stdout) in self.failures.iter() { - failures.push(f.name.to_str()); + failures.push(f.name.to_string()); if stdout.len() > 0 { fail_out.push_str(format!("---- {} stdout ----\n\t", f.name.as_slice()).as_slice()); @@ -1520,7 +1520,7 @@ mod tests { let filtered = filter_tests(&opts, tests); assert_eq!(filtered.len(), 1); - assert_eq!(filtered.get(0).desc.name.to_str(), + assert_eq!(filtered.get(0).desc.name.to_string(), "1".to_string()); assert!(filtered.get(0).desc.ignore == false); } @@ -1571,7 +1571,7 @@ mod tests { "test::sort_tests".to_string()); for (a, b) in expected.iter().zip(filtered.iter()) { - assert!(*a == b.desc.name.to_str()); + assert!(*a == b.desc.name.to_string()); } } diff --git a/src/libtest/stats.rs b/src/libtest/stats.rs index b0562c39dc285..55ee78f86961f 100644 --- a/src/libtest/stats.rs +++ b/src/libtest/stats.rs @@ -385,8 +385,8 @@ pub fn write_boxplot( let range = hi - lo; - let lostr = lo.to_str(); - let histr = hi.to_str(); + let lostr = lo.to_string(); + let histr = hi.to_string(); let overhead_width = lostr.len() + histr.len() + 4; let range_width = width_hint - overhead_width; diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs index 94a7acaf0765a..b7930409aec60 100644 --- a/src/libtime/lib.rs +++ b/src/libtime/lib.rs @@ -1022,7 +1022,7 @@ pub fn strftime(format: &str, tm: &Tm) -> String { 'U' => format!("{:02d}", (tm.tm_yday - tm.tm_wday + 7) / 7), 'u' => { let i = tm.tm_wday as int; - (if i == 0 { 7 } else { i }).to_str() + (if i == 0 { 7 } else { i }).to_string() } 'V' => iso_week('V', tm), 'v' => { @@ -1035,8 +1035,8 @@ pub fn strftime(format: &str, tm: &Tm) -> String { format!("{:02d}", (tm.tm_yday - (tm.tm_wday - 1 + 7) % 7 + 7) / 7) } - 'w' => (tm.tm_wday as int).to_str(), - 'Y' => (tm.tm_year as int + 1900).to_str(), + 'w' => (tm.tm_wday as int).to_string(), + 'Y' => (tm.tm_year as int + 1900).to_string(), 'y' => format!("{:02d}", (tm.tm_year as int + 1900) % 100), 'Z' => "".to_string(), // FIXME(pcwalton): Implement this. 'z' => { diff --git a/src/liburl/lib.rs b/src/liburl/lib.rs index 566602b409104..41a3ed0e6a8a4 100644 --- a/src/liburl/lib.rs +++ b/src/liburl/lib.rs @@ -453,11 +453,11 @@ fn query_from_str(rawquery: &str) -> Query { * let query = vec!(("title".to_string(), "The Village".to_string()), * ("north".to_string(), "52.91".to_string()), * ("west".to_string(), "4.10".to_string())); - * println!("{}", url::query_to_str(&query)); // title=The%20Village&north=52.91&west=4.10 + * println!("{}", url::query_to_string(&query)); // title=The%20Village&north=52.91&west=4.10 * ``` */ #[allow(unused_must_use)] -pub fn query_to_str(query: &Query) -> String { +pub fn query_to_string(query: &Query) -> String { use std::io::MemWriter; use std::str; @@ -526,7 +526,7 @@ fn get_authority(rawurl: &str) -> Result<(Option, String, Option, String), String> { if !rawurl.starts_with("//") { // there is no authority. - return Ok((None, "".to_string(), None, rawurl.to_str())); + return Ok((None, "".to_string(), None, rawurl.to_string())); } enum State { @@ -841,7 +841,7 @@ impl fmt::Show for Url { try!(write!(f, "{}", self.path)); if !self.query.is_empty() { - try!(write!(f, "?{}", query_to_str(&self.query))); + try!(write!(f, "?{}", query_to_string(&self.query))); } match self.fragment { @@ -871,13 +871,13 @@ impl fmt::Show for Path { impl hash::Hash for Url { fn hash(&self, state: &mut S) { - self.to_str().hash(state) + self.to_string().hash(state) } } impl hash::Hash for Path { fn hash(&self, state: &mut S) { - self.to_str().hash(state) + self.to_string().hash(state) } } @@ -1074,62 +1074,62 @@ mod tests { #[test] fn test_full_url_parse_and_format() { let url = "http://user:pass@rust-lang.org/doc?s=v#something"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_userless_url_parse_and_format() { let url = "http://rust-lang.org/doc?s=v#something"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_queryless_url_parse_and_format() { let url = "http://user:pass@rust-lang.org/doc#something"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_empty_query_url_parse_and_format() { let url = "http://user:pass@rust-lang.org/doc?#something"; let should_be = "http://user:pass@rust-lang.org/doc#something"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), should_be); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), should_be); } #[test] fn test_fragmentless_url_parse_and_format() { let url = "http://user:pass@rust-lang.org/doc?q=v"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_minimal_url_parse_and_format() { let url = "http://rust-lang.org/doc"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_url_with_port_parse_and_format() { let url = "http://rust-lang.org:80/doc"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_scheme_host_only_url_parse_and_format() { let url = "http://rust-lang.org"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_pathless_url_parse_and_format() { let url = "http://user:pass@rust-lang.org?q=v#something"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] fn test_scheme_host_fragment_only_url_parse_and_format() { let url = "http://rust-lang.org#something"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] @@ -1151,7 +1151,7 @@ mod tests { #[test] fn test_url_without_authority() { let url = "mailto:test@email.com"; - assert_eq!(from_str(url).unwrap().to_str().as_slice(), url); + assert_eq!(from_str(url).unwrap().to_string().as_slice(), url); } #[test] diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs index 19627e2c2ce50..6113e1dc5c1e9 100644 --- a/src/libuuid/lib.rs +++ b/src/libuuid/lib.rs @@ -33,7 +33,7 @@ use uuid::Uuid; fn main() { let uuid1 = Uuid::new_v4(); - println!("{}", uuid1.to_str()); + println!("{}", uuid1.to_string()); } ``` @@ -620,7 +620,7 @@ mod test { // Round-trip let uuid_orig = Uuid::new_v4(); - let orig_str = uuid_orig.to_str(); + let orig_str = uuid_orig.to_string(); let uuid_out = Uuid::parse_string(orig_str.as_slice()).unwrap(); assert!(uuid_orig == uuid_out); @@ -648,9 +648,9 @@ mod test { } #[test] - fn test_to_str() { + fn test_to_string() { let uuid1 = Uuid::new_v4(); - let s = uuid1.to_str(); + let s = uuid1.to_string(); assert!(s.len() == 32); assert!(s.as_slice().chars().all(|c| c.is_digit_radix(16))); @@ -683,7 +683,7 @@ mod test { let uuid1 = Uuid::new_v4(); let hs = uuid1.to_hyphenated_str(); - let ss = uuid1.to_str(); + let ss = uuid1.to_string(); let hsn = str::from_chars(hs.as_slice() .chars() @@ -702,7 +702,7 @@ mod test { let uuid_hs = Uuid::parse_string(hs.as_slice()).unwrap(); assert!(uuid_hs == uuid); - let ss = uuid.to_str(); + let ss = uuid.to_string(); let uuid_ss = Uuid::parse_string(ss.as_slice()).unwrap(); assert!(uuid_ss == uuid); } @@ -831,10 +831,10 @@ mod bench { } #[bench] - pub fn uuid_to_str(b: &mut Bencher) { + pub fn uuid_to_string(b: &mut Bencher) { let u = Uuid::new_v4(); b.iter(|| { - u.to_str(); + u.to_string(); }) } diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index f42844b9f19d2..0ffa62253d4b2 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -597,14 +597,14 @@ extern "C" void LLVMDICompositeTypeSetTypeArray( unwrapDI(CompositeType).setTypeArray(unwrapDI(TypeArray)); } -extern "C" char *LLVMTypeToString(LLVMTypeRef Type) { +extern "C" char *LLVMTypeToStringing(LLVMTypeRef Type) { std::string s; llvm::raw_string_ostream os(s); unwrap(Type)->print(os); return strdup(os.str().data()); } -extern "C" char *LLVMValueToString(LLVMValueRef Value) { +extern "C" char *LLVMValueToStringing(LLVMValueRef Value) { std::string s; llvm::raw_string_ostream os(s); os << "("; diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs index c3e877f808176..1d2d02d7d5926 100644 --- a/src/test/bench/core-set.rs +++ b/src/test/bench/core-set.rs @@ -90,11 +90,11 @@ impl Results { let mut set = f(); timed(&mut self.sequential_strings, || { for i in range(0u, num_keys) { - set.insert(i.to_str()); + set.insert(i.to_string()); } for i in range(0u, num_keys) { - assert!(set.contains(&i.to_str())); + assert!(set.contains(&i.to_string())); } }) } @@ -103,7 +103,7 @@ impl Results { let mut set = f(); timed(&mut self.random_strings, || { for _ in range(0, num_keys) { - let s = rng.gen::().to_str(); + let s = rng.gen::().to_string(); set.insert(s); } }) @@ -112,11 +112,11 @@ impl Results { { let mut set = f(); for i in range(0u, num_keys) { - set.insert(i.to_str()); + set.insert(i.to_string()); } timed(&mut self.delete_strings, || { for i in range(0u, num_keys) { - assert!(set.remove(&i.to_str())); + assert!(set.remove(&i.to_string())); } }) } diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/core-uint-to-str.rs index 1c51ea055d04e..f385175156609 100644 --- a/src/test/bench/core-uint-to-str.rs +++ b/src/test/bench/core-uint-to-str.rs @@ -24,7 +24,7 @@ fn main() { let n = from_str::(args.get(1).as_slice()).unwrap(); for i in range(0u, n) { - let x = i.to_str(); + let x = i.to_string(); println!("{}", x); } } diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index 28786f1e163d9..841e4608ffcd4 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -48,7 +48,7 @@ fn show_color_list(set: Vec) -> String { let mut out = String::new(); for col in set.iter() { out.push_char(' '); - out.push_str(col.to_str().as_slice()); + out.push_str(col.to_string().as_slice()); } out } diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 67be7d121a454..c9ce681482787 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -64,7 +64,7 @@ fn sort_and_fmt(mm: &HashMap , uint>, total: uint) -> String { k.as_slice() .to_ascii() .to_upper() - .into_str(), v).as_slice()); + .into_string(), v).as_slice()); } return buffer @@ -72,7 +72,7 @@ fn sort_and_fmt(mm: &HashMap , uint>, total: uint) -> String { // given a map, search for the frequency of a pattern fn find(mm: &HashMap , uint>, key: String) -> uint { - let key = key.to_owned().into_ascii().as_slice().to_lower().into_str(); + let key = key.to_owned().into_ascii().as_slice().to_lower().into_string(); match mm.find_equiv(&key.as_bytes()) { option::None => { return 0u; } option::Some(&num) => { return num; } diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 57a6d0e7c523d..8b80ac2aaab31 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -115,7 +115,7 @@ fn main() { let elapsed = stop - start; - println!("{}\t{}\t{}", n, fibn, elapsed.to_str()); + println!("{}\t{}\t{}", n, fibn, elapsed.to_string()); } } } diff --git a/src/test/bench/shootout-regex-dna.rs b/src/test/bench/shootout-regex-dna.rs index 19b9d5638d0d8..bdf6862d0b133 100644 --- a/src/test/bench/shootout-regex-dna.rs +++ b/src/test/bench/shootout-regex-dna.rs @@ -67,7 +67,7 @@ fn main() { } else { box io::stdin() as Box }; - let mut seq = rdr.read_to_str().unwrap(); + let mut seq = rdr.read_to_string().unwrap(); let ilen = seq.len(); seq = regex!(">[^\n]*\n|\n").replace_all(seq.as_slice(), NoExpand("")); @@ -109,7 +109,7 @@ fn main() { let (mut variant_strs, mut counts) = (vec!(), vec!()); for variant in variants.move_iter() { let seq_arc_copy = seq_arc.clone(); - variant_strs.push(variant.to_str().to_owned()); + variant_strs.push(variant.to_string().to_owned()); counts.push(Future::spawn(proc() { count_matches(seq_arc_copy.as_slice(), &variant) })); diff --git a/src/test/compile-fail/issue-14541.rs b/src/test/compile-fail/issue-14541.rs index 2dcfeac513c32..d820b4d79a99b 100644 --- a/src/test/compile-fail/issue-14541.rs +++ b/src/test/compile-fail/issue-14541.rs @@ -17,4 +17,4 @@ fn make(v: vec2) { //~^^ ERROR struct `vec2` does not have a field named `z` } -fn main() { } \ No newline at end of file +fn main() { } diff --git a/src/test/compile-fail/issue-2063.rs b/src/test/compile-fail/issue-2063.rs index 2c3dda015471f..00607f850347c 100644 --- a/src/test/compile-fail/issue-2063.rs +++ b/src/test/compile-fail/issue-2063.rs @@ -16,18 +16,18 @@ struct t(Box); //~ ERROR this type cannot be instantiated trait to_str_2 { - fn my_to_str() -> String; + fn my_to_string() -> String; } // I use an impl here because it will cause // the compiler to attempt autoderef and then // try to resolve the method. impl to_str_2 for t { - fn my_to_str() -> String { "t".to_string() } + fn my_to_string() -> String { "t".to_string() } } fn new_t(x: t) { - x.my_to_str(); //~ ERROR does not implement + x.my_to_string(); //~ ERROR does not implement } fn main() { diff --git a/src/test/compile-fail/issue-3973.rs b/src/test/compile-fail/issue-3973.rs index 7fe7778c1a59e..e400c4cc630ac 100644 --- a/src/test/compile-fail/issue-3973.rs +++ b/src/test/compile-fail/issue-3973.rs @@ -17,17 +17,17 @@ struct Point { y: f64, } -impl ToStr for Point { //~ ERROR implements a method not defined in the trait +impl ToString for Point { //~ ERROR implements a method not defined in the trait fn new(x: f64, y: f64) -> Point { Point { x: x, y: y } } - fn to_str(&self) -> String { + fn to_string(&self) -> String { format!("({}, {})", self.x, self.y) } } fn main() { let p = Point::new(0.0, 0.0); - println!("{}", p.to_str()); + println!("{}", p.to_string()); } diff --git a/src/test/compile-fail/lint-uppercase-variables.rs b/src/test/compile-fail/lint-uppercase-variables.rs index f1b36d719e959..0827c197debbf 100644 --- a/src/test/compile-fail/lint-uppercase-variables.rs +++ b/src/test/compile-fail/lint-uppercase-variables.rs @@ -30,7 +30,7 @@ fn main() { let mut buff = [0u8, ..16]; match f.read(buff) { Ok(cnt) => println!("read this many bytes: {}", cnt), - Err(IoError{ kind: EndOfFile, .. }) => println!("Got end of file: {}", EndOfFile.to_str()), + Err(IoError{ kind: EndOfFile, .. }) => println!("Got end of file: {}", EndOfFile.to_string()), //~^ ERROR variable names should start with a lowercase character } diff --git a/src/test/compile-fail/moves-based-on-type-block-bad.rs b/src/test/compile-fail/moves-based-on-type-block-bad.rs index 73323def28d78..0d9bd3805cf47 100644 --- a/src/test/compile-fail/moves-based-on-type-block-bad.rs +++ b/src/test/compile-fail/moves-based-on-type-block-bad.rs @@ -29,7 +29,7 @@ fn main() { f(&s, |hellothere| { match hellothere.x { //~ ERROR cannot move out box Foo(_) => {} - box Bar(x) => println!("{}", x.to_str()), //~ NOTE attempting to move value to here + box Bar(x) => println!("{}", x.to_string()), //~ NOTE attempting to move value to here box Baz => {} } }) diff --git a/src/test/compile-fail/multitrait.rs b/src/test/compile-fail/multitrait.rs index f772b96c697b7..c7b0bc8822be1 100644 --- a/src/test/compile-fail/multitrait.rs +++ b/src/test/compile-fail/multitrait.rs @@ -12,7 +12,7 @@ struct S { y: int } -impl Cmp, ToStr for S { //~ ERROR: expected `{` but found `,` +impl Cmp, ToString for S { //~ ERROR: expected `{` but found `,` fn eq(&&other: S) { false } - fn to_str(&self) -> String { "hi".to_string() } + fn to_string(&self) -> String { "hi".to_string() } } diff --git a/src/test/compile-fail/no-implicit-prelude-nested.rs b/src/test/compile-fail/no-implicit-prelude-nested.rs index 779a1ec7a5bf0..2fb097f111db4 100644 --- a/src/test/compile-fail/no-implicit-prelude-nested.rs +++ b/src/test/compile-fail/no-implicit-prelude-nested.rs @@ -21,7 +21,7 @@ mod foo { impl Add for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Clone for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Iterator for Test {} //~ ERROR: attempt to implement a nonexistent trait - impl ToStr for Test {} //~ ERROR: attempt to implement a nonexistent trait + impl ToString for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Writer for Test {} //~ ERROR: attempt to implement a nonexistent trait fn foo() { @@ -33,7 +33,7 @@ mod foo { impl Add for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Clone for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Iterator for Test {} //~ ERROR: attempt to implement a nonexistent trait - impl ToStr for Test {} //~ ERROR: attempt to implement a nonexistent trait + impl ToString for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Writer for Test {} //~ ERROR: attempt to implement a nonexistent trait fn foo() { @@ -48,7 +48,7 @@ fn qux() { impl Add for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Clone for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Iterator for Test {} //~ ERROR: attempt to implement a nonexistent trait - impl ToStr for Test {} //~ ERROR: attempt to implement a nonexistent trait + impl ToString for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Writer for Test {} //~ ERROR: attempt to implement a nonexistent trait fn foo() { diff --git a/src/test/compile-fail/no-implicit-prelude.rs b/src/test/compile-fail/no-implicit-prelude.rs index fecc597b8fd2f..c0f7bea25b57a 100644 --- a/src/test/compile-fail/no-implicit-prelude.rs +++ b/src/test/compile-fail/no-implicit-prelude.rs @@ -20,7 +20,7 @@ struct Test; impl Add for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Clone for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Iterator for Test {} //~ ERROR: attempt to implement a nonexistent trait -impl ToStr for Test {} //~ ERROR: attempt to implement a nonexistent trait +impl ToString for Test {} //~ ERROR: attempt to implement a nonexistent trait impl Writer for Test {} //~ ERROR: attempt to implement a nonexistent trait fn main() { diff --git a/src/test/compile-fail/non-exhaustive-pattern-witness.rs b/src/test/compile-fail/non-exhaustive-pattern-witness.rs index 22e93d70858e4..516e111e6a0a5 100644 --- a/src/test/compile-fail/non-exhaustive-pattern-witness.rs +++ b/src/test/compile-fail/non-exhaustive-pattern-witness.rs @@ -71,4 +71,4 @@ fn main() { struct_with_a_nested_enum_and_vector(); enum_with_multiple_missing_variants(); enum_struct_variant(); -} \ No newline at end of file +} diff --git a/src/test/compile-fail/uninhabited-enum-cast.rs b/src/test/compile-fail/uninhabited-enum-cast.rs index fad20a7e37374..9f91337db9f21 100644 --- a/src/test/compile-fail/uninhabited-enum-cast.rs +++ b/src/test/compile-fail/uninhabited-enum-cast.rs @@ -11,7 +11,7 @@ enum E {} fn f(e: E) { - println!("{}", (e as int).to_str()); //~ ERROR non-scalar cast + println!("{}", (e as int).to_string()); //~ ERROR non-scalar cast } fn main() {} diff --git a/src/test/compile-fail/use-after-move-implicity-coerced-object.rs b/src/test/compile-fail/use-after-move-implicity-coerced-object.rs index 753c91d1dc958..043f3a233a625 100644 --- a/src/test/compile-fail/use-after-move-implicity-coerced-object.rs +++ b/src/test/compile-fail/use-after-move-implicity-coerced-object.rs @@ -23,10 +23,10 @@ impl fmt::Show for Number { } struct List { - list: Vec> } + list: Vec> } impl List { - fn push(&mut self, n: Box) { + fn push(&mut self, n: Box) { self.list.push(n); } } @@ -35,6 +35,6 @@ fn main() { let n = box Number { n: 42 }; let mut l = box List { list: Vec::new() }; l.push(n); - let x = n.to_str(); + let x = n.to_string(); //~^ ERROR: use of moved value: `n` } diff --git a/src/test/debuginfo/cross-crate-type-uniquing.rs b/src/test/debuginfo/cross-crate-type-uniquing.rs index 47de06c485696..8f718add2a312 100644 --- a/src/test/debuginfo/cross-crate-type-uniquing.rs +++ b/src/test/debuginfo/cross-crate-type-uniquing.rs @@ -21,4 +21,4 @@ pub fn p() -> C { C } -fn main() { } \ No newline at end of file +fn main() { } diff --git a/src/test/run-pass/capturing-logging.rs b/src/test/run-pass/capturing-logging.rs index 23607e16795ed..4053a00a5a3c1 100644 --- a/src/test/run-pass/capturing-logging.rs +++ b/src/test/run-pass/capturing-logging.rs @@ -45,7 +45,7 @@ fn main() { debug!("debug"); info!("info"); }); - let s = r.read_to_str().unwrap(); + let s = r.read_to_string().unwrap(); assert!(s.as_slice().contains("info")); assert!(!s.as_slice().contains("debug")); } diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index f3d12d21684e4..e3dbaa62d3532 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -11,16 +11,16 @@ // aux-build:cci_class_cast.rs extern crate cci_class_cast; -use std::to_str::ToStr; +use std::to_str::ToString; use cci_class_cast::kitty::cat; -fn print_out(thing: Box, expected: String) { - let actual = thing.to_str(); +fn print_out(thing: Box, expected: String) { + let actual = thing.to_string(); println!("{}", actual); assert_eq!(actual.to_string(), expected); } pub fn main() { - let nyan: Box = box cat(0u, 2, "nyan".to_string()) as Box; + let nyan: Box = box cat(0u, 2, "nyan".to_string()) as Box; print_out(nyan, "nyan".to_string()); } diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index 3d486144c3eed..7143888298072 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -57,13 +57,13 @@ impl fmt::Show for cat { } } -fn print_out(thing: Box, expected: String) { - let actual = thing.to_str(); +fn print_out(thing: Box, expected: String) { + let actual = thing.to_string(); println!("{}", actual); assert_eq!(actual.to_string(), expected); } pub fn main() { - let nyan: Box = box cat(0u, 2, "nyan".to_string()) as Box; + let nyan: Box = box cat(0u, 2, "nyan".to_string()) as Box; print_out(nyan, "nyan".to_string()); } diff --git a/src/test/run-pass/deriving-show-2.rs b/src/test/run-pass/deriving-show-2.rs index a5e86dee18e8c..fa82e42d793f0 100644 --- a/src/test/run-pass/deriving-show-2.rs +++ b/src/test/run-pass/deriving-show-2.rs @@ -41,15 +41,15 @@ impl fmt::Show for Custom { } pub fn main() { - assert_eq!(B1.to_str(), "B1".to_string()); - assert_eq!(B2.to_str(), "B2".to_string()); - assert_eq!(C1(3).to_str(), "C1(3)".to_string()); - assert_eq!(C2(B2).to_str(), "C2(B2)".to_string()); - assert_eq!(D1{ a: 2 }.to_str(), "D1 { a: 2 }".to_string()); - assert_eq!(E.to_str(), "E".to_string()); - assert_eq!(F(3).to_str(), "F(3)".to_string()); - assert_eq!(G(3, 4).to_str(), "G(3, 4)".to_string()); - assert_eq!(G(3, 4).to_str(), "G(3, 4)".to_string()); - assert_eq!(I{ a: 2, b: 4 }.to_str(), "I { a: 2, b: 4 }".to_string()); - assert_eq!(J(Custom).to_str(), "J(yay)".to_string()); + assert_eq!(B1.to_string(), "B1".to_string()); + assert_eq!(B2.to_string(), "B2".to_string()); + assert_eq!(C1(3).to_string(), "C1(3)".to_string()); + assert_eq!(C2(B2).to_string(), "C2(B2)".to_string()); + assert_eq!(D1{ a: 2 }.to_string(), "D1 { a: 2 }".to_string()); + assert_eq!(E.to_string(), "E".to_string()); + assert_eq!(F(3).to_string(), "F(3)".to_string()); + assert_eq!(G(3, 4).to_string(), "G(3, 4)".to_string()); + assert_eq!(G(3, 4).to_string(), "G(3, 4)".to_string()); + assert_eq!(I{ a: 2, b: 4 }.to_string(), "I { a: 2, b: 4 }".to_string()); + assert_eq!(J(Custom).to_string(), "J(yay)".to_string()); } diff --git a/src/test/run-pass/exponential-notation.rs b/src/test/run-pass/exponential-notation.rs index 7d79815f7780d..ad47c4aa56b87 100644 --- a/src/test/run-pass/exponential-notation.rs +++ b/src/test/run-pass/exponential-notation.rs @@ -17,18 +17,18 @@ macro_rules! t(($a:expr, $b:expr) => { { let (r, _) = $a; assert_eq!(r, $b.to_st pub fn main() { // Basic usage - t!(to_str(1.2345678e-5, 10u, true, s::SignNeg, s::DigMax(6), s::ExpDec, false), + t!(to_string(1.2345678e-5, 10u, true, s::SignNeg, s::DigMax(6), s::ExpDec, false), "1.234568e-5") // Hexadecimal output - t!(to_str(7.281738281250e+01, 16u, true, s::SignAll, s::DigMax(6), s::ExpBin, false), + t!(to_string(7.281738281250e+01, 16u, true, s::SignAll, s::DigMax(6), s::ExpBin, false), "+1.2345p+6") - t!(to_str(-1.777768135071e-02, 16u, true, s::SignAll, s::DigMax(6), s::ExpBin, false), + t!(to_string(-1.777768135071e-02, 16u, true, s::SignAll, s::DigMax(6), s::ExpBin, false), "-1.2345p-6") // Some denormals - t!(to_str(4.9406564584124654e-324, 10u, true, s::SignNeg, s::DigMax(6), s::ExpBin, false), + t!(to_string(4.9406564584124654e-324, 10u, true, s::SignNeg, s::DigMax(6), s::ExpBin, false), "1p-1074") - t!(to_str(2.2250738585072009e-308, 10u, true, s::SignNeg, s::DigMax(6), s::ExpBin, false), + t!(to_string(2.2250738585072009e-308, 10u, true, s::SignNeg, s::DigMax(6), s::ExpBin, false), "1p-1022") } diff --git a/src/test/run-pass/fixed_length_vec_glue.rs b/src/test/run-pass/fixed_length_vec_glue.rs index 62cfd10dbfb46..3b7c5083bb48e 100644 --- a/src/test/run-pass/fixed_length_vec_glue.rs +++ b/src/test/run-pass/fixed_length_vec_glue.rs @@ -17,6 +17,6 @@ struct Struc { a: u8, b: [int, ..3], c: int } pub fn main() { let arr = [1,2,3]; let struc = Struc {a: 13u8, b: arr, c: 42}; - let s = repr::repr_to_str(&struc); + let s = repr::repr_to_string(&struc); assert_eq!(s, "Struc{a: 13u8, b: [1, 2, 3], c: 42}".to_string()); } diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs index d48a944c2f0d8..4a89d277e9f56 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/run-pass/issue-2904.rs @@ -79,8 +79,8 @@ fn read_board_grid(mut input: rdr) mod test { #[test] - pub fn trivial_to_str() { - assert!(lambda.to_str() == "\\") + pub fn trivial_to_string() { + assert!(lambda.to_string() == "\\") } } diff --git a/src/test/run-pass/issue-3037.rs b/src/test/run-pass/issue-3037.rs index 1d442198aec70..1555098f2911b 100644 --- a/src/test/run-pass/issue-3037.rs +++ b/src/test/run-pass/issue-3037.rs @@ -10,7 +10,7 @@ enum what { } -fn what_to_str(x: what) -> String +fn what_to_string(x: what) -> String { match x { } diff --git a/src/test/run-pass/issue-3559.rs b/src/test/run-pass/issue-3559.rs index 3220c8d0c69c4..43628af382703 100644 --- a/src/test/run-pass/issue-3559.rs +++ b/src/test/run-pass/issue-3559.rs @@ -24,6 +24,6 @@ pub fn main() { let mut table = HashMap::new(); table.insert("one".to_string(), 1); table.insert("two".to_string(), 2); - assert!(check_strs(table.to_str().as_slice(), "{one: 1, two: 2}") || - check_strs(table.to_str().as_slice(), "{two: 2, one: 1}")); + assert!(check_strs(table.to_string().as_slice(), "{one: 1, two: 2}") || + check_strs(table.to_string().as_slice(), "{two: 2, one: 1}")); } diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs index ac022d5c21238..e38969c25263c 100644 --- a/src/test/run-pass/issue-3563-3.rs +++ b/src/test/run-pass/issue-3563-3.rs @@ -94,7 +94,7 @@ impl AsciiArt { } } -// Allows AsciiArt to be converted to a string using the libcore ToStr trait. +// Allows AsciiArt to be converted to a string using the libcore ToString trait. // Note that the %s fmt! specifier will not call this automatically. impl fmt::Show for AsciiArt { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -159,7 +159,7 @@ pub fn check_strs(actual: &str, expected: &str) -> bool { fn test_ascii_art_ctor() { let art = AsciiArt(3, 3, '*'); - assert!(check_strs(art.to_str().as_slice(), "...\n...\n...")); + assert!(check_strs(art.to_string().as_slice(), "...\n...\n...")); } @@ -168,7 +168,7 @@ fn test_add_pt() { art.add_pt(0, 0); art.add_pt(0, -10); art.add_pt(1, 2); - assert!(check_strs(art.to_str().as_slice(), "*..\n...\n.*.")); + assert!(check_strs(art.to_string().as_slice(), "*..\n...\n.*.")); } @@ -176,7 +176,7 @@ fn test_shapes() { let mut art = AsciiArt(4, 4, '*'); art.add_rect(Rect {top_left: Point {x: 0, y: 0}, size: Size {width: 4, height: 4}}); art.add_point(Point {x: 2, y: 2}); - assert!(check_strs(art.to_str().as_slice(), "****\n*..*\n*.**\n****")); + assert!(check_strs(art.to_string().as_slice(), "****\n*..*\n*.**\n****")); } pub fn main() { diff --git a/src/test/run-pass/issue-3702.rs b/src/test/run-pass/issue-3702.rs index c9cedc3b7de47..3f219da0a879a 100644 --- a/src/test/run-pass/issue-3702.rs +++ b/src/test/run-pass/issue-3702.rs @@ -11,11 +11,11 @@ pub fn main() { trait Text { - fn to_str(&self) -> String; + fn to_string(&self) -> String; } fn to_string(t: Box) { - println!("{}", t.to_str()); + println!("{}", t.to_string()); } } diff --git a/src/test/run-pass/issue-4241.rs b/src/test/run-pass/issue-4241.rs index b27720b8579a4..3ebc3e6457376 100644 --- a/src/test/run-pass/issue-4241.rs +++ b/src/test/run-pass/issue-4241.rs @@ -96,19 +96,19 @@ priv fn parse_response(io: @io::Reader) -> Result { } } -priv fn cmd_to_str(cmd: ~[String]) -> String { +priv fn cmd_to_string(cmd: ~[String]) -> String { let mut res = "*".to_string(); - res.push_str(cmd.len().to_str()); + res.push_str(cmd.len().to_string()); res.push_str("\r\n"); for s in cmd.iter() { - res.push_str(["$".to_string(), s.len().to_str(), "\r\n".to_string(), + res.push_str(["$".to_string(), s.len().to_string(), "\r\n".to_string(), (*s).clone(), "\r\n".to_string()].concat() ); } res } fn query(cmd: ~[String], sb: TcpSocketBuf) -> Result { - let cmd = cmd_to_str(cmd); + let cmd = cmd_to_string(cmd); //println!("{}", cmd); sb.write_str(cmd); let res = parse_response(@sb as @io::Reader); @@ -116,7 +116,7 @@ fn query(cmd: ~[String], sb: TcpSocketBuf) -> Result { } fn query2(cmd: ~[String]) -> Result { - let _cmd = cmd_to_str(cmd); + let _cmd = cmd_to_string(cmd); io::with_str_reader("$3\r\nXXX\r\n".to_string())(|sb| { let res = parse_response(@sb as @io::Reader); println!("{:?}", res); diff --git a/src/test/run-pass/issue-5280.rs b/src/test/run-pass/issue-5280.rs index 16fd45a5615f2..977cd08ba3770 100644 --- a/src/test/run-pass/issue-5280.rs +++ b/src/test/run-pass/issue-5280.rs @@ -11,15 +11,15 @@ type FontTableTag = u32; trait FontTableTagConversions { - fn tag_to_str(self); + fn tag_to_string(self); } impl FontTableTagConversions for FontTableTag { - fn tag_to_str(self) { + fn tag_to_string(self) { &self; } } pub fn main() { - 5.tag_to_str(); + 5.tag_to_string(); } diff --git a/src/test/run-pass/issue-7784.rs b/src/test/run-pass/issue-7784.rs index 52c2d57753a14..20b89efe27e3a 100644 --- a/src/test/run-pass/issue-7784.rs +++ b/src/test/run-pass/issue-7784.rs @@ -33,4 +33,4 @@ fn main() { assert_eq!(a, "baz"); assert!(xs == ["foo", "foo"]); assert_eq!(d, "baz"); -} \ No newline at end of file +} diff --git a/src/test/run-pass/monad.rs b/src/test/run-pass/monad.rs index 2b67ef09c59db..783dc32426a65 100644 --- a/src/test/run-pass/monad.rs +++ b/src/test/run-pass/monad.rs @@ -38,7 +38,7 @@ impl option_monad for Option { } fn transform(x: Option) -> Option { - x.bind(|n| Some(*n + 1) ).bind(|n| Some(n.to_str()) ) + x.bind(|n| Some(*n + 1) ).bind(|n| Some(n.to_string()) ) } pub fn main() { diff --git a/src/test/run-pass/move-out-of-field.rs b/src/test/run-pass/move-out-of-field.rs index e7d679c41e853..92c5e025b9b21 100644 --- a/src/test/run-pass/move-out-of-field.rs +++ b/src/test/run-pass/move-out-of-field.rs @@ -20,7 +20,7 @@ impl StringBuffer { } } -fn to_str(sb: StringBuffer) -> String { +fn to_string(sb: StringBuffer) -> String { sb.s } @@ -30,6 +30,6 @@ pub fn main() { }; sb.append("Hello, "); sb.append("World!"); - let str = to_str(sb); + let str = to_string(sb); assert_eq!(str.as_slice(), "Hello, World!"); } diff --git a/src/test/run-pass/new-impl-syntax.rs b/src/test/run-pass/new-impl-syntax.rs index 9fd6e9616757e..8532b5f51dc5e 100644 --- a/src/test/run-pass/new-impl-syntax.rs +++ b/src/test/run-pass/new-impl-syntax.rs @@ -32,6 +32,6 @@ impl fmt::Show for PolymorphicThingy { } pub fn main() { - println!("{}", Thingy { x: 1, y: 2 }.to_str()); - println!("{}", PolymorphicThingy { x: Thingy { x: 1, y: 2 } }.to_str()); + println!("{}", Thingy { x: 1, y: 2 }.to_string()); + println!("{}", PolymorphicThingy { x: Thingy { x: 1, y: 2 } }.to_string()); } diff --git a/src/test/run-pass/overloaded-deref-count.rs b/src/test/run-pass/overloaded-deref-count.rs index 24dde8ada1816..d414e9912c6dc 100644 --- a/src/test/run-pass/overloaded-deref-count.rs +++ b/src/test/run-pass/overloaded-deref-count.rs @@ -72,7 +72,7 @@ pub fn main() { // N.B. This is required because method lookup hasn't been performed so // we don't know whether the called method takes mutable self, before // the dereference itself is type-checked (a chicken-and-egg problem). - (*n).to_str(); + (*n).to_string(); assert_eq!(n.counts(), (2, 4)); // Mutable deref used for calling a method taking &mut self. diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/run-pass/send_str_treemap.rs index 68eca8f21a7f5..f3a730aa2b395 100644 --- a/src/test/run-pass/send_str_treemap.rs +++ b/src/test/run-pass/send_str_treemap.rs @@ -12,7 +12,7 @@ extern crate collections; use std::collections::{ Map, MutableMap}; use std::str::{SendStr, Owned, Slice}; -use std::to_str::ToStr; +use std::to_str::ToString; use self::collections::TreeMap; use std::option::Some; diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index f6c314b20dd14..72c23b901e726 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -31,7 +31,7 @@ trait uint_utils { impl uint_utils for uint { fn str(&self) -> String { - self.to_str() + self.to_string() } fn multi(&self, f: |uint|) { let mut c = 0u; diff --git a/src/test/run-pass/task-stderr.rs b/src/test/run-pass/task-stderr.rs index 6a71f9df6e45e..ceffd1e363667 100644 --- a/src/test/run-pass/task-stderr.rs +++ b/src/test/run-pass/task-stderr.rs @@ -21,6 +21,6 @@ fn main() { }); assert!(res.is_err()); - let output = reader.read_to_str().unwrap(); + let output = reader.read_to_string().unwrap(); assert!(output.as_slice().contains("Hello, world!")); } diff --git a/src/test/run-pass/tcp-connect-timeouts.rs b/src/test/run-pass/tcp-connect-timeouts.rs index 6116ed29e1aa8..a742eb82bb5d0 100644 --- a/src/test/run-pass/tcp-connect-timeouts.rs +++ b/src/test/run-pass/tcp-connect-timeouts.rs @@ -54,7 +54,7 @@ macro_rules! iotest ( iotest!(fn eventual_timeout() { use native; let addr = next_test_ip4(); - let host = addr.ip.to_str(); + let host = addr.ip.to_string(); let port = addr.port; // Use a native task to receive connections because it turns out libuv is @@ -82,7 +82,7 @@ iotest!(fn eventual_timeout() { iotest!(fn timeout_success() { let addr = next_test_ip4(); - let host = addr.ip.to_str(); + let host = addr.ip.to_string(); let port = addr.port; let _l = TcpListener::bind(host.as_slice(), port).unwrap().listen(); diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/run-pass/tcp-stress.rs index 99bf247229e05..63b232e97f336 100644 --- a/src/test/run-pass/tcp-stress.rs +++ b/src/test/run-pass/tcp-stress.rs @@ -61,7 +61,7 @@ fn main() { for _ in range(0, 1000) { let tx = tx.clone(); TaskBuilder::new().stack_size(64 * 1024).spawn(proc() { - let host = addr.ip.to_str(); + let host = addr.ip.to_string(); let port = addr.port; match TcpStream::connect(host.as_slice(), port) { Ok(stream) => { diff --git a/src/test/run-pass/test-ignore-cfg.rs b/src/test/run-pass/test-ignore-cfg.rs index c3387a963a701..b36fbca2da048 100644 --- a/src/test/run-pass/test-ignore-cfg.rs +++ b/src/test/run-pass/test-ignore-cfg.rs @@ -27,10 +27,10 @@ fn checktests() { let tests = __test::TESTS; assert!( - tests.iter().any(|t| t.desc.name.to_str().as_slice() == "shouldignore" && + tests.iter().any(|t| t.desc.name.to_string().as_slice() == "shouldignore" && t.desc.ignore)); assert!( - tests.iter().any(|t| t.desc.name.to_str().as_slice() == "shouldnotignore" && + tests.iter().any(|t| t.desc.name.to_string().as_slice() == "shouldnotignore" && !t.desc.ignore)); } diff --git a/src/test/run-pass/trait-cast.rs b/src/test/run-pass/trait-cast.rs index 18209be0dece3..ffbe4e6551db7 100644 --- a/src/test/run-pass/trait-cast.rs +++ b/src/test/run-pass/trait-cast.rs @@ -39,7 +39,7 @@ impl to_str for Option { impl to_str for int { fn to_str_(&self) -> String { - self.to_str() + self.to_string() } } diff --git a/src/test/run-pass/trait-generic.rs b/src/test/run-pass/trait-generic.rs index 78e1e100bd65f..3e8b8d5604bb9 100644 --- a/src/test/run-pass/trait-generic.rs +++ b/src/test/run-pass/trait-generic.rs @@ -14,7 +14,7 @@ trait to_str { fn to_string(&self) -> String; } impl to_str for int { - fn to_string(&self) -> String { self.to_str() } + fn to_string(&self) -> String { self.to_string() } } impl to_str for String { fn to_string(&self) -> String { self.clone() } diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs index cd7c5c6f8f7d4..00a2c4b31b8b2 100644 --- a/src/test/run-pass/trait-to-str.rs +++ b/src/test/run-pass/trait-to-str.rs @@ -15,7 +15,7 @@ trait to_str { } impl to_str for int { - fn to_string(&self) -> String { self.to_str() } + fn to_string(&self) -> String { self.to_string() } } impl to_str for Vec { diff --git a/src/test/run-pass/vec-to_str.rs b/src/test/run-pass/vec-to_str.rs index 2eadd2fc3c893..dc40135ff6a5f 100644 --- a/src/test/run-pass/vec-to_str.rs +++ b/src/test/run-pass/vec-to_str.rs @@ -9,12 +9,12 @@ // except according to those terms. pub fn main() { - assert_eq!((vec!(0, 1)).to_str(), "[0, 1]".to_string()); - assert_eq!((&[1, 2]).to_str(), "[1, 2]".to_string()); + assert_eq!((vec!(0, 1)).to_string(), "[0, 1]".to_string()); + assert_eq!((&[1, 2]).to_string(), "[1, 2]".to_string()); let foo = vec!(3, 4); let bar = &[4, 5]; - assert_eq!(foo.to_str(), "[3, 4]".to_string()); - assert_eq!(bar.to_str(), "[4, 5]".to_string()); + assert_eq!(foo.to_string(), "[3, 4]".to_string()); + assert_eq!(bar.to_string(), "[4, 5]".to_string()); }