std: Remove usage of fmt!

1 files changed, 11 insertions, 11 deletions

diff --git a/src/libstd/local_data.rs b/src/libstd/local_data.rs
index 5058821d456..54c77e2d9f6 100644
--- a/src/libstd/local_data.rs
+++ b/src/libstd/local_data.rs
@@ -143,8 +143,8 @@ pub fn pop<T: 'static>(key: Key<T>) -> Option<T> {
         match *entry {
             Some((k, _, loan)) if k == key_value => {
                 if loan != NoLoan {
-                    fail!("TLS value cannot be removed because it is currently \
-                          borrowed as %s", loan.describe());
+                    fail2!("TLS value cannot be removed because it is currently \
+                          borrowed as {}", loan.describe());
                 }
                 // Move the data out of the `entry` slot via util::replace.
                 // This is guaranteed to succeed because we already matched
@@ -240,8 +240,8 @@ fn get_with<T: 'static, U>(key: Key<T>,
                         }
                         (ImmLoan, ImmLoan) => {}
                         (want, cur) => {
-                            fail!("TLS slot cannot be borrowed as %s because \
-                                   it is already borrowed as %s",
+                            fail2!("TLS slot cannot be borrowed as {} because \
+                                    it is already borrowed as {}",
                                   want.describe(), cur.describe());
                         }
                     }
@@ -304,8 +304,8 @@ pub fn set<T: 'static>(key: Key<T>, data: T) {
             match *entry {
                 Some((ekey, _, loan)) if key == ekey => {
                     if loan != NoLoan {
-                        fail!("TLS value cannot be overwritten because it is
-                               already borrowed as %s", loan.describe())
+                        fail2!("TLS value cannot be overwritten because it is
+                               already borrowed as {}", loan.describe())
                     }
                     true
                 }
@@ -388,15 +388,15 @@ mod tests {
         static my_key: Key<@~str> = &Key;
         modify(my_key, |data| {
             match data {
-                Some(@ref val) => fail!("unwelcome value: %s", *val),
+                Some(@ref val) => fail2!("unwelcome value: {}", *val),
                 None           => Some(@~"first data")
             }
         });
         modify(my_key, |data| {
             match data {
                 Some(@~"first data") => Some(@~"next data"),
-                Some(@ref val)       => fail!("wrong value: %s", *val),
-                None                 => fail!("missing value")
+                Some(@ref val)       => fail2!("wrong value: {}", *val),
+                None                 => fail2!("missing value")
             }
         });
         assert!(*(pop(my_key).unwrap()) == ~"next data");
@@ -456,11 +456,11 @@ mod tests {
             set(str_key, @~"string data");
             set(box_key, @@());
             set(int_key, @42);
-            fail!();
+            fail2!();
         }
         // Not quite nondeterministic.
         set(int_key, @31337);
-        fail!();
+        fail2!();
     }
 
     #[test]