diff options
| author | bors <bors@rust-lang.org> | 2014-05-03 10:56:57 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-03 10:56:57 -0700 |
| commit | 0c691df8acaf10aa3721476e5d7fafcee11b0aaa (patch) | |
| tree | 7aca9144c64039fea0aff444e13870b4be40fae7 /src/liblog | |
| parent | bca9647cd34c78a1c7c2409fbb2c31cb2c8194d7 (diff) | |
| parent | a5be12ce7e88c1d28de1c98215991127d1e765f0 (diff) | |
| download | rust-0c691df8acaf10aa3721476e5d7fafcee11b0aaa.tar.gz rust-0c691df8acaf10aa3721476e5d7fafcee11b0aaa.zip | |
auto merge of #13773 : brson/rust/boxxy, r=alexcrichton
`box` is the way you allocate in future-rust.
Diffstat (limited to 'src/liblog')
| -rw-r--r-- | src/liblog/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs index 87c82e1dd7d..1571370d033 100644 --- a/src/liblog/lib.rs +++ b/src/liblog/lib.rs @@ -203,7 +203,7 @@ pub fn log(level: u32, args: &fmt::Arguments) { // frob the slot while we're doing the logging. This will destroy any logger // set during logging. let mut logger = local_data::pop(local_logger).unwrap_or_else(|| { - ~DefaultLogger { handle: io::stderr() } as ~Logger:Send + box DefaultLogger { handle: io::stderr() } as ~Logger:Send }); logger.log(level, args); local_data::set(local_logger, logger); @@ -286,7 +286,7 @@ fn init() { LOG_LEVEL = max_level; assert!(DIRECTIVES.is_null()); - DIRECTIVES = cast::transmute(~directives); + DIRECTIVES = cast::transmute(box directives); // Schedule the cleanup for this global for when the runtime exits. rt::at_exit(proc() { |
