auto merge of #8963 : jmgrosen/rust/issue-8881, r=alexcrichton

This commit is contained in:
bors 2013-09-03 19:46:42 -07:00
commit 383073883f
5 changed files with 23 additions and 10 deletions

View file

@ -889,7 +889,11 @@ pub fn std_macros() -> @str {
{ pub $c:ident: $input:ty -> $out:ty; } => {
pub mod $c {
#[allow(unused_imports)];
#[allow(non_uppercase_statics)];
use super::*;
static key: ::std::local_data::Key<
@::std::condition::Handler<$input, $out>> =
&::std::local_data::Key;
@ -907,7 +911,11 @@ pub fn std_macros() -> @str {
// FIXME (#6009): remove mod's `pub` below once variant above lands.
pub mod $c {
#[allow(unused_imports)];
#[allow(non_uppercase_statics)];
use super::*;
static key: ::std::local_data::Key<
@::std::condition::Handler<$input, $out>> =
&::std::local_data::Key;