diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-17 11:26:52 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-17 11:50:32 -0800 |
| commit | 5c98952409c9123b5f26b3c620029cd1914a07b6 (patch) | |
| tree | d996edc2a0a259556be226b4f60437f961fb09b2 /src | |
| parent | 76fbb5d527a2893c4d4c88b24d0f5d6dd0dcef32 (diff) | |
| download | rust-5c98952409c9123b5f26b3c620029cd1914a07b6.tar.gz rust-5c98952409c9123b5f26b3c620029cd1914a07b6.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_driver/test.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_driver/test.rs b/src/librustc_driver/test.rs index 6a50af3bc79..508af4c28e6 100644 --- 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 index 5fb320b9136..839e99c81d1 100644 --- 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 \ |