Skip to content

Commit

Permalink
auto merge of #8820 : alexcrichton/rust/no-io-writer, r=brson
Browse files Browse the repository at this point in the history
At the same time, this updates the TyVisitor to use a mutable self because it's
probably going to be mutating state as it goes along anyway.
  • Loading branch information
bors committed Aug 30, 2013
2 parents 974f854 + 97f61e7 commit f94844c
Show file tree
Hide file tree
Showing 11 changed files with 1,717 additions and 503 deletions.
2 changes: 1 addition & 1 deletion src/librustc/middle/ty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4572,7 +4572,7 @@ pub fn visitor_object_ty(tcx: ctxt,
trait_ref.def_id,
trait_ref.substs.clone(),
RegionTraitStore(region),
ast::m_imm,
ast::m_mutbl,
EmptyBuiltinBounds())))
}

Expand Down
10 changes: 2 additions & 8 deletions src/libstd/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,10 @@ pub fn console_off() {
#[lang="log_type"]
#[allow(missing_doc)]
pub fn log_type<T>(_level: u32, object: &T) {
use io;
use repr;
use str;

let bytes = do io::with_bytes_writer |writer| {
repr::write_repr(writer, object);
};
use sys;

// XXX: Bad allocation
let msg = str::from_bytes(bytes);
let msg = sys::log_str(object);
newsched_log_str(msg);
}

Expand Down
Loading

0 comments on commit f94844c

Please sign in to comment.