Test fixes and rebase conflicts

alexcrichton · alexcrichton · commit 5c98952409c9 · 2014-12-17T11:50:32.000-08:00
diff --git a/src/librustc_driver/test.rs b/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);
 }
 
diff --git a/src/libsyntax/ext/deriving/mod.rs b/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 \

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ fn test_env<F>(source_string: &str,`
`139`	`139`	`stability_index);`
`140`	`140`	`let infcx = infer::new_infer_ctxt(&tcx);`
`141`	`141`	`body(Env { infcx: &infcx });`
`142`		`- infcx.resolve_regions_and_report_errors();`
	`142`	`+ infcx.resolve_regions_and_report_errors(ast::CRATE_NODE_ID);`
`143`	`143`	`assert_eq!(tcx.sess.err_count(), expected_err_count);`
`144`	`144`	`}`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,`
`84`	`84`
`85`	`85`	`expand!(encodable::expand_deriving_encodable)`
`86`	`86`	`}`
`87`		`- "Decodable" =>`
	`87`	`+ "Decodable" => {`
`88`	`88`	`// NOTE: uncomment after a stage0 snap`
`89`	`89`	`// cx.span_warn(titem.span,`
`90`	`90`	`// "deriving(Decodable) is deprecated \`