Skip to content

Commit a06da49

Browse files
committed
---
yaml --- r: 127277 b: refs/heads/try c: 1c2c494 h: refs/heads/master i: 127275: 21bd539 v: v3
1 parent 5a7e65c commit a06da49

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 87d2bf400ce1bc2cec832f9d5b8e763f06bb7f43
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 12e0f72f517516ac4fce2aed85e6142e9b874bce
5-
refs/heads/try: d45a569995e586ff749a76f8c5879d7daa922e34
5+
refs/heads/try: 1c2c4942a6a3a491274e907becf29f966a870a31
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libdebug/repr.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ impl<'a> ReprVisitor<'a> {
165165
}
166166

167167
pub fn write_escaped_slice(&mut self, slice: &str) -> bool {
168-
try!(self, self.writer.write(['"' as u8]));
168+
try!(self, self.writer.write([b'"']));
169169
for ch in slice.chars() {
170170
if !self.write_escaped_char(ch, true) { return false }
171171
}
172-
try!(self, self.writer.write(['"' as u8]));
172+
try!(self, self.writer.write([b'"']));
173173
true
174174
}
175175

@@ -188,7 +188,7 @@ impl<'a> ReprVisitor<'a> {
188188
inner: *const TyDesc) -> bool {
189189
let mut p = ptr as *const u8;
190190
let (sz, al) = unsafe { ((*inner).size, (*inner).align) };
191-
try!(self, self.writer.write(['[' as u8]));
191+
try!(self, self.writer.write([b'[']));
192192
let mut first = true;
193193
let mut left = len;
194194
// unit structs have 0 size, and don't loop forever.
@@ -203,7 +203,7 @@ impl<'a> ReprVisitor<'a> {
203203
p = align(unsafe { p.offset(sz as int) as uint }, al) as *const u8;
204204
left -= dec;
205205
}
206-
try!(self, self.writer.write([']' as u8]));
206+
try!(self, self.writer.write([b']']));
207207
true
208208
}
209209

@@ -263,9 +263,9 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
263263

264264
fn visit_char(&mut self) -> bool {
265265
self.get::<char>(|this, &ch| {
266-
try!(this, this.writer.write(['\'' as u8]));
266+
try!(this, this.writer.write([b'\'']));
267267
if !this.write_escaped_char(ch, false) { return false }
268-
try!(this, this.writer.write(['\'' as u8]));
268+
try!(this, this.writer.write([b'\'']));
269269
true
270270
})
271271
}
@@ -310,7 +310,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
310310
}
311311

312312
fn visit_rptr(&mut self, mtbl: uint, inner: *const TyDesc) -> bool {
313-
try!(self, self.writer.write(['&' as u8]));
313+
try!(self, self.writer.write([b'&']));
314314
self.write_mut_qualifier(mtbl);
315315
self.get::<*const u8>(|this, p| {
316316
this.visit_ptr_inner(*p, inner)
@@ -319,7 +319,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
319319

320320
fn visit_evec_slice(&mut self, mtbl: uint, inner: *const TyDesc) -> bool {
321321
self.get::<raw::Slice<()>>(|this, s| {
322-
try!(this, this.writer.write(['&' as u8]));
322+
try!(this, this.writer.write([b'&']));
323323
this.write_mut_qualifier(mtbl);
324324
let size = unsafe {
325325
if (*inner).size == 0 { 1 } else { (*inner).size }
@@ -338,7 +338,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
338338

339339
fn visit_enter_rec(&mut self, _n_fields: uint,
340340
_sz: uint, _align: uint) -> bool {
341-
try!(self, self.writer.write(['{' as u8]));
341+
try!(self, self.writer.write([b'{']));
342342
true
343343
}
344344

@@ -356,7 +356,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
356356

357357
fn visit_leave_rec(&mut self, _n_fields: uint,
358358
_sz: uint, _align: uint) -> bool {
359-
try!(self, self.writer.write(['}' as u8]));
359+
try!(self, self.writer.write([b'}']));
360360
true
361361
}
362362

@@ -365,9 +365,9 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
365365
try!(self, self.writer.write(name.as_bytes()));
366366
if n_fields != 0 {
367367
if named_fields {
368-
try!(self, self.writer.write(['{' as u8]));
368+
try!(self, self.writer.write([b'{']));
369369
} else {
370-
try!(self, self.writer.write(['(' as u8]));
370+
try!(self, self.writer.write([b'(']));
371371
}
372372
}
373373
true
@@ -390,17 +390,17 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
390390
_sz: uint, _align: uint) -> bool {
391391
if n_fields != 0 {
392392
if named_fields {
393-
try!(self, self.writer.write(['}' as u8]));
393+
try!(self, self.writer.write([b'}']));
394394
} else {
395-
try!(self, self.writer.write([')' as u8]));
395+
try!(self, self.writer.write([b')']));
396396
}
397397
}
398398
true
399399
}
400400

401401
fn visit_enter_tup(&mut self, _n_fields: uint,
402402
_sz: uint, _align: uint) -> bool {
403-
try!(self, self.writer.write(['(' as u8]));
403+
try!(self, self.writer.write([b'(']));
404404
true
405405
}
406406

@@ -415,9 +415,9 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
415415
fn visit_leave_tup(&mut self, _n_fields: uint,
416416
_sz: uint, _align: uint) -> bool {
417417
if _n_fields == 1 {
418-
try!(self, self.writer.write([',' as u8]));
418+
try!(self, self.writer.write([b',']));
419419
}
420-
try!(self, self.writer.write([')' as u8]));
420+
try!(self, self.writer.write([b')']));
421421
true
422422
}
423423

@@ -455,7 +455,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
455455
if write {
456456
try!(self, self.writer.write(name.as_bytes()));
457457
if n_fields > 0 {
458-
try!(self, self.writer.write(['(' as u8]));
458+
try!(self, self.writer.write([b'(']));
459459
}
460460
}
461461
true
@@ -487,7 +487,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
487487
match self.var_stk[self.var_stk.len() - 1] {
488488
Matched => {
489489
if n_fields > 0 {
490-
try!(self, self.writer.write([')' as u8]));
490+
try!(self, self.writer.write([b')']));
491491
}
492492
}
493493
_ => ()

0 commit comments

Comments
 (0)