Skip to content

Commit 1de4b65

Browse files
alexcrichtonalexcrichton
committed
Updates with core::fmt changes
1. Wherever the `buf` field of a `Formatter` was used, the `Formatter` is used instead. 2. The usage of `write_fmt` is minimized as much as possible, the `write!` macro is preferred wherever possible. 3. Usage of `fmt::write` is minimized, favoring the `write!` macro instead.
1 parent 8767093 commit 1de4b65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+275
-291
lines changed

‎src/libcollections/btree.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,8 @@ impl<K: fmt::Show + TotalOrd, V: fmt::Show> fmt::Show for Leaf<K, V> {
425425
///Returns a string representation of a Leaf.
426426
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
427427
for (i, s) in self.elts.iter().enumerate() {
428-
if i != 0 { try!(write!(f.buf, " // ")) }
429-
try!(write!(f.buf, "{}", *s))
428+
if i != 0 { try!(write!(f, " // ")) }
429+
try!(write!(f, "{}", *s))
430430
}
431431
Ok(())
432432
}
@@ -654,10 +654,10 @@ impl<K: fmt::Show + TotalOrd, V: fmt::Show> fmt::Show for Branch<K, V> {
654654
///Returns a string representation of a Branch.
655655
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
656656
for (i, s) in self.elts.iter().enumerate() {
657-
if i != 0 { try!(write!(f.buf, " // ")) }
658-
try!(write!(f.buf, "{}", *s))
657+
if i != 0 { try!(write!(f, " // ")) }
658+
try!(write!(f, "{}", *s))
659659
}
660-
write!(f.buf, " // rightmost child: ({}) ", *self.rightmost_child)
660+
write!(f, " // rightmost child: ({}) ", *self.rightmost_child)
661661
}
662662
}
663663

@@ -715,7 +715,7 @@ impl<K: TotalOrd, V: TotalEq> TotalOrd for LeafElt<K, V> {
715715
impl<K: fmt::Show + TotalOrd, V: fmt::Show> fmt::Show for LeafElt<K, V> {
716716
///Returns a string representation of a LeafElt.
717717
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
718-
write!(f.buf, "Key: {}, value: {};", self.key, self.value)
718+
write!(f, "Key: {}, value: {};", self.key, self.value)
719719
}
720720
}
721721

@@ -765,7 +765,7 @@ impl<K: fmt::Show + TotalOrd, V: fmt::Show> fmt::Show for BranchElt<K, V> {
765765
/// Returns string containing key, value, and child (which should recur to a
766766
/// leaf) Consider changing in future to be more readable.
767767
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
768-
write!(f.buf, "Key: {}, value: {}, (child: {})",
768+
write!(f, "Key: {}, value: {}, (child: {})",
769769
self.key, self.value, *self.left)
770770
}
771771
}

‎src/libcollections/hashmap.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1418,14 +1418,14 @@ impl<K: TotalEq + Hash<S>, V: Eq, S, H: Hasher<S>> Eq for HashMap<K, V, H> {
14181418

14191419
impl<K: TotalEq + Hash<S> + Show, V: Show, S, H: Hasher<S>> Show for HashMap<K, V, H> {
14201420
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1421-
try!(write!(f.buf, r"\{"));
1421+
try!(write!(f, r"\{"));
14221422

14231423
for (i, (k, v)) in self.iter().enumerate() {
1424-
if i != 0 { try!(write!(f.buf, ", ")); }
1425-
try!(write!(f.buf, "{}: {}", *k, *v));
1424+
if i != 0 { try!(write!(f, ", ")); }
1425+
try!(write!(f, "{}: {}", *k, *v));
14261426
}
14271427

1428-
write!(f.buf, r"\}")
1428+
write!(f, r"\}")
14291429
}
14301430
}
14311431

@@ -1605,14 +1605,14 @@ impl<T: TotalEq + Hash<S>, S, H: Hasher<S>> HashSet<T, H> {
16051605

16061606
impl<T: TotalEq + Hash<S> + fmt::Show, S, H: Hasher<S>> fmt::Show for HashSet<T, H> {
16071607
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1608-
try!(write!(f.buf, r"\{"));
1608+
try!(write!(f, r"\{"));
16091609

16101610
for (i, x) in self.iter().enumerate() {
1611-
if i != 0 { try!(write!(f.buf, ", ")); }
1612-
try!(write!(f.buf, "{}", *x));
1611+
if i != 0 { try!(write!(f, ", ")); }
1612+
try!(write!(f, "{}", *x));
16131613
}
16141614

1615-
write!(f.buf, r"\}")
1615+
write!(f, r"\}")
16161616
}
16171617
}
16181618

‎src/libcollections/lru_cache.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -205,20 +205,20 @@ impl<A: fmt::Show + Hash + TotalEq, B: fmt::Show> fmt::Show for LruCache<A, B> {
205205
/// Return a string that lists the key-value pairs from most-recently
206206
/// used to least-recently used.
207207
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
208-
try!(write!(f.buf, r"\{"));
208+
try!(write!(f, r"\{"));
209209
let mut cur = self.head;
210210
for i in range(0, self.len()) {
211-
if i > 0 { try!(write!(f.buf, ", ")) }
211+
if i > 0 { try!(write!(f, ", ")) }
212212
unsafe {
213213
cur = (*cur).next;
214-
try!(write!(f.buf, "{}", (*cur).key));
214+
try!(write!(f, "{}", (*cur).key));
215215
}
216-
try!(write!(f.buf, ": "));
216+
try!(write!(f, ": "));
217217
unsafe {
218-
try!(write!(f.buf, "{}", (*cur).value));
218+
try!(write!(f, "{}", (*cur).value));
219219
}
220220
}
221-
write!(f.buf, r"\}")
221+
write!(f, r"\}")
222222
}
223223
}
224224

‎src/libcore/prelude.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub use iter::{FromIterator, Extendable};
3535
pub use iter::{Iterator, DoubleEndedIterator, RandomAccessIterator, CloneableIterator};
3636
pub use iter::{OrdIterator, MutableDoubleEndedIterator, ExactSize};
3737
pub use num::{Num, NumCast, CheckedAdd, CheckedSub, CheckedMul};
38-
pub use num::{Signed, Unsigned};
38+
pub use num::{Signed, Unsigned, Float};
3939
pub use num::{Primitive, Int, ToPrimitive, FromPrimitive};
4040
pub use ptr::RawPtr;
4141
pub use str::{Str, StrSlice};

‎src/libgreen/macros.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ macro_rules! rtabort (
5151
)
5252

5353
pub fn dumb_println(args: &fmt::Arguments) {
54-
use std::io;
5554
use std::rt;
56-
5755
let mut w = rt::Stderr;
58-
let _ = fmt::writeln(&mut w as &mut io::Writer, args);
56+
let _ = writeln!(&mut w, "{}", args);
5957
}
6058

6159
pub fn abort(msg: &str) -> ! {

‎src/liblog/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl fmt::Show for LogLevel {
188188
impl fmt::Signed for LogLevel {
189189
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
190190
let LogLevel(level) = *self;
191-
write!(fmt.buf, "{}", level)
191+
write!(fmt, "{}", level)
192192
}
193193
}
194194

‎src/libnum/bigint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl Default for BigUint {
120120

121121
impl fmt::Show for BigUint {
122122
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
123-
write!(f.buf, "{}", self.to_str_radix(10))
123+
write!(f, "{}", self.to_str_radix(10))
124124
}
125125
}
126126

@@ -843,7 +843,7 @@ impl Default for BigInt {
843843

844844
impl fmt::Show for BigInt {
845845
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
846-
write!(f.buf, "{}", self.to_str_radix(10))
846+
write!(f, "{}", self.to_str_radix(10))
847847
}
848848
}
849849

‎src/libnum/complex.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ impl<T: Clone + Num> One for Complex<T> {
171171
impl<T: fmt::Show + Num + Ord> fmt::Show for Complex<T> {
172172
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
173173
if self.im < Zero::zero() {
174-
write!(f.buf, "{}-{}i", self.re, -self.im)
174+
write!(f, "{}-{}i", self.re, -self.im)
175175
} else {
176-
write!(f.buf, "{}+{}i", self.re, self.im)
176+
write!(f, "{}+{}i", self.re, self.im)
177177
}
178178
}
179179
}

‎src/libnum/rational.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ impl<T: Clone + Integer + Ord>
276276
impl<T: fmt::Show> fmt::Show for Ratio<T> {
277277
/// Renders as `numer/denom`.
278278
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
279-
write!(f.buf, "{}/{}", self.numer, self.denom)
279+
write!(f, "{}/{}", self.numer, self.denom)
280280
}
281281
}
282282
impl<T: ToStrRadix> ToStrRadix for Ratio<T> {

‎src/libregex/parse.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct Error {
3737

3838
impl fmt::Show for Error {
3939
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
40-
write!(f.buf, "Regex syntax error near position {}: {}",
40+
write!(f, "Regex syntax error near position {}: {}",
4141
self.pos, self.msg)
4242
}
4343
}

‎src/libregex/re.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pub struct Regex {
117117
impl fmt::Show for Regex {
118118
/// Shows the original regular expression.
119119
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
120-
write!(f.buf, "{}", self.original)
120+
write!(f, "{}", self.original)
121121
}
122122
}
123123

‎src/librustc/metadata/tyencode.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515

1616
use std::cell::RefCell;
1717
use collections::HashMap;
18-
use std::io;
1918
use std::io::MemWriter;
20-
use std::fmt;
2119

2220
use middle::ty::param_ty;
2321
use middle::ty;
@@ -28,9 +26,7 @@ use syntax::ast::*;
2826
use syntax::diagnostic::SpanHandler;
2927
use syntax::parse::token;
3028

31-
macro_rules! mywrite( ($wr:expr, $($arg:tt)*) => (
32-
format_args!(|a| { mywrite($wr, a) }, $($arg)*)
33-
) )
29+
macro_rules! mywrite( ($($arg:tt)*) => ({ write!($($arg)*); }) )
3430

3531
pub struct ctxt<'a> {
3632
pub diag: &'a SpanHandler,
@@ -52,10 +48,6 @@ pub struct ty_abbrev {
5248

5349
pub type abbrev_map = RefCell<HashMap<ty::t, ty_abbrev>>;
5450

55-
fn mywrite(w: &mut MemWriter, fmt: &fmt::Arguments) {
56-
fmt::write(&mut *w as &mut io::Writer, fmt);
57-
}
58-
5951
pub fn enc_ty(w: &mut MemWriter, cx: &ctxt, t: ty::t) {
6052
match cx.abbrevs.borrow_mut().find(&t) {
6153
Some(a) => { w.write(a.s.as_bytes()); return; }

‎src/librustc/middle/liveness.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,13 @@ pub fn check_crate(tcx: &ty::ctxt,
183183

184184
impl fmt::Show for LiveNode {
185185
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
186-
write!(f.buf, "ln({})", self.get())
186+
write!(f, "ln({})", self.get())
187187
}
188188
}
189189

190190
impl fmt::Show for Variable {
191191
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
192-
write!(f.buf, "v({})", self.get())
192+
write!(f, "v({})", self.get())
193193
}
194194
}
195195

‎src/librustc/middle/ty.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ pub struct t { inner: *t_opaque }
388388

389389
impl fmt::Show for t {
390390
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
391-
f.buf.write_str("*t_opaque")
391+
"*t_opaque".fmt(f)
392392
}
393393
}
394394

@@ -912,7 +912,7 @@ impl Vid for TyVid {
912912

913913
impl fmt::Show for TyVid {
914914
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result{
915-
write!(f.buf, "<generic \\#{}>", self.to_uint())
915+
write!(f, "<generic \\#{}>", self.to_uint())
916916
}
917917
}
918918

@@ -922,7 +922,7 @@ impl Vid for IntVid {
922922

923923
impl fmt::Show for IntVid {
924924
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
925-
write!(f.buf, "<generic integer \\#{}>", self.to_uint())
925+
write!(f, "<generic integer \\#{}>", self.to_uint())
926926
}
927927
}
928928

@@ -932,7 +932,7 @@ impl Vid for FloatVid {
932932

933933
impl fmt::Show for FloatVid {
934934
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
935-
write!(f.buf, "<generic float \\#{}>", self.to_uint())
935+
write!(f, "<generic float \\#{}>", self.to_uint())
936936
}
937937
}
938938

@@ -949,7 +949,7 @@ impl fmt::Show for RegionVid {
949949
impl fmt::Show for FnSig {
950950
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
951951
// grr, without tcx not much we can do.
952-
write!(f.buf, "(...)")
952+
write!(f, "(...)")
953953
}
954954
}
955955

@@ -1987,7 +1987,7 @@ impl ops::Sub<TypeContents,TypeContents> for TypeContents {
19871987

19881988
impl fmt::Show for TypeContents {
19891989
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1990-
write!(f.buf, "TypeContents({:t})", self.bits)
1990+
write!(f, "TypeContents({:t})", self.bits)
19911991
}
19921992
}
19931993

‎src/librustc/middle/typeck/variance.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@ enum VarianceTerm<'a> {
240240
impl<'a> fmt::Show for VarianceTerm<'a> {
241241
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
242242
match *self {
243-
ConstantTerm(c1) => write!(f.buf, "{}", c1),
244-
TransformTerm(v1, v2) => write!(f.buf, "({} \u00D7 {})", v1, v2),
245-
InferredTerm(id) => write!(f.buf, "[{}]", { let InferredIndex(i) = id; i })
243+
ConstantTerm(c1) => write!(f, "{}", c1),
244+
TransformTerm(v1, v2) => write!(f, "({} \u00D7 {})", v1, v2),
245+
InferredTerm(id) => write!(f, "[{}]", { let InferredIndex(i) = id; i })
246246
}
247247
}
248248
}

‎src/librustdoc/html/escape.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl<'a> fmt::Show for Escape<'a> {
2929
for (i, ch) in s.bytes().enumerate() {
3030
match ch as char {
3131
'<' | '>' | '&' | '\'' | '"' => {
32-
try!(fmt.buf.write(pile_o_bits.slice(last, i).as_bytes()));
32+
try!(fmt.write(pile_o_bits.slice(last, i).as_bytes()));
3333
let s = match ch as char {
3434
'>' => "&gt;",
3535
'<' => "&lt;",
@@ -38,15 +38,15 @@ impl<'a> fmt::Show for Escape<'a> {
3838
'"' => "&quot;",
3939
_ => unreachable!()
4040
};
41-
try!(fmt.buf.write(s.as_bytes()));
41+
try!(fmt.write(s.as_bytes()));
4242
last = i + 1;
4343
}
4444
_ => {}
4545
}
4646
}
4747

4848
if last < s.len() {
49-
try!(fmt.buf.write(pile_o_bits.slice_from(last).as_bytes()));
49+
try!(fmt.write(pile_o_bits.slice_from(last).as_bytes()));
5050
}
5151
Ok(())
5252
}

0 commit comments

Comments
 (0)