diff options
| author | bors <bors@rust-lang.org> | 2013-07-21 22:34:36 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-21 22:34:36 -0700 |
| commit | 74f4badcab30c91b018f308d2c44641abed7d732 (patch) | |
| tree | 81dd71ea871e583375edf2dc423b17f3653b2e08 /src/libsyntax | |
| parent | 3d6c0bc05640b9cc62db9fe287903cb709056dcb (diff) | |
| parent | f51e2ad435d7c0b4cb1bdebc5b6db29b65249125 (diff) | |
| download | rust-74f4badcab30c91b018f308d2c44641abed7d732.tar.gz rust-74f4badcab30c91b018f308d2c44641abed7d732.zip | |
auto merge of #7955 : thestinger/rust/snapshot, r=huonw
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ast_util.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/diagnostic.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 97e940805bb..15ac50b917c 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -704,10 +704,7 @@ pub fn new_sctable_internal() -> SCTable { // fetch the SCTable from TLS, create one if it doesn't yet exist. pub fn get_sctable() -> @mut SCTable { - #[cfg(not(stage0))] static sctable_key: local_data::Key<@@mut SCTable> = &local_data::Key; - #[cfg(stage0)] - fn sctable_key(_: @@mut SCTable) {} match local_data::get(sctable_key, |k| k.map(|&k| *k)) { None => { let new_table = @@mut new_sctable_internal(); diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs index 717c5571994..8be55ac0dc7 100644 --- a/src/libsyntax/diagnostic.rs +++ b/src/libsyntax/diagnostic.rs @@ -188,10 +188,7 @@ fn diagnosticcolor(lvl: level) -> term::color::Color { } fn print_maybe_styled(msg: &str, color: term::attr::Attr) { - #[cfg(not(stage0))] static tls_terminal: local_data::Key<@Option<term::Terminal>> = &local_data::Key; - #[cfg(stage0)] - fn tls_terminal(_: @Option<term::Terminal>) {} let stderr = io::stderr(); diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 754b7268a4a..322424b90fb 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -484,11 +484,8 @@ fn mk_fresh_ident_interner() -> @ident_interner { // if an interner exists in TLS, return it. Otherwise, prepare a // fresh one. pub fn get_ident_interner() -> @ident_interner { - #[cfg(not(stage0))] static key: local_data::Key<@@::parse::token::ident_interner> = &local_data::Key; - #[cfg(stage0)] - fn key(_: @@::parse::token::ident_interner) {} match local_data::get(key, |k| k.map(|&k| *k)) { Some(interner) => *interner, None => { |