Test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2015-01-07 18:53:58 -08:00
parent 11e265c2e0
commit 0dc48b47a8
194 changed files with 386 additions and 309 deletions

View file

@ -1730,11 +1730,8 @@ pub struct MacroDef {
#[cfg(test)]
mod test {
use serialize::json;
use serialize;
use codemap::*;
use super::*;
use std::fmt;
// are ASTs encodable?
#[test]