std: Remove format_strbuf!()

[rust.git] / src / librustc / middle / privacy.rs

diff --git a/src/librustc/middle/privacy.rs b/src/librustc/middle/privacy.rs
index 1f2bb643b3cff40f4e1a61bd6d6bbac2ffa13851..5b47336efe5e8ef2181e8f844a5af457444f7858 100644 (file)
--- a/src/librustc/middle/privacy.rs
+++ b/src/librustc/middle/privacy.rs
@@ -547,9 +547,7 @@ fn ensure_public(&self, span: Span, to_check: ast::DefId,
                      source_did: Option<ast::DefId>, msg: &str) -> CheckResult {
         let id = match self.def_privacy(to_check) {
             ExternallyDenied => {
-                return Some((span,
-                             format_strbuf!("{} is private", msg),
-                             None))
+                return Some((span, format!("{} is private", msg), None))
             }
             Allowable => return None,
             DisallowedBy(id) => id,
@@ -560,11 +558,9 @@ fn ensure_public(&self, span: Span, to_check: ast::DefId,
         // because the item itself is private or because its parent is private
         // and its parent isn't in our ancestry.
         let (err_span, err_msg) = if id == source_did.unwrap_or(to_check).node {
-            return Some((span,
-                         format_strbuf!("{} is private", msg),
-                         None));
+            return Some((span, format!("{} is private", msg), None));
         } else {
-            (span, format_strbuf!("{} is inaccessible", msg))
+            (span, format!("{} is inaccessible", msg))
         };
         let item = match self.tcx.map.find(id) {
             Some(ast_map::NodeItem(item)) => {
@@ -600,9 +596,8 @@ fn ensure_public(&self, span: Span, to_check: ast::DefId,
             ast::ItemEnum(..) => "enum",
             _ => return Some((err_span, err_msg, None))
         };
-        let msg = format_strbuf!("{} `{}` is private",
-                                 desc,
-                                 token::get_ident(item.ident));
+        let msg = format!("{} `{}` is private", desc,
+                          token::get_ident(item.ident));
         Some((err_span, err_msg, Some((span, msg))))
     }