Skip to content

Commit b8084b9

Browse files
committed
---
yaml --- r: 77818 b: refs/heads/master c: f94844c h: refs/heads/master v: v3
1 parent f1895f4 commit b8084b9

File tree

12 files changed

+1718
-504
lines changed

12 files changed

+1718
-504
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 974f854bb528c9a94af62990965ac62a1aa0dbed
2+
refs/heads/master: f94844c55893de9489cf64c4a8b9d66c962a560b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 60fba4d7d677ec098e6a43014132fe99f7547363
55
refs/heads/try: ebfe63cd1c0b5d23f7ea60c69b4fde2e30cfd42a

trunk/src/librustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4572,7 +4572,7 @@ pub fn visitor_object_ty(tcx: ctxt,
45724572
trait_ref.def_id,
45734573
trait_ref.substs.clone(),
45744574
RegionTraitStore(region),
4575-
ast::m_imm,
4575+
ast::m_mutbl,
45764576
EmptyBuiltinBounds())))
45774577
}
45784578

trunk/src/libstd/logging.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,10 @@ pub fn console_off() {
4141
#[lang="log_type"]
4242
#[allow(missing_doc)]
4343
pub fn log_type<T>(_level: u32, object: &T) {
44-
use io;
45-
use repr;
46-
use str;
47-
48-
let bytes = do io::with_bytes_writer |writer| {
49-
repr::write_repr(writer, object);
50-
};
44+
use sys;
5145

5246
// XXX: Bad allocation
53-
let msg = str::from_bytes(bytes);
47+
let msg = sys::log_str(object);
5448
newsched_log_str(msg);
5549
}
5650

0 commit comments

Comments
 (0)