Test fixes and rebase conflicts

src/librustc_driver/test.rs

@@ -139,7 +139,7 @@ fn test_env<F>(source_string: &str,
                           stability_index);
     let infcx = infer::new_infer_ctxt(&tcx);
     body(Env { infcx: &infcx });
-    infcx.resolve_regions_and_report_errors();
+    infcx.resolve_regions_and_report_errors(ast::CRATE_NODE_ID);
     assert_eq!(tcx.sess.err_count(), expected_err_count);
 }
 

src/libsyntax/ext/deriving/mod.rs

@@ -84,7 +84,7 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,
 
                                 expand!(encodable::expand_deriving_encodable)
                             }
-                            "Decodable" =>
+                            "Decodable" => {
                                 // NOTE: uncomment after a stage0 snap
                                 // cx.span_warn(titem.span,
                                 //              "deriving(Decodable) is deprecated \