about summary refs log tree commit diff
path: root/src/librustc_interface
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-09 02:05:15 +0000
committerbors <bors@rust-lang.org>2020-01-09 02:05:15 +0000
commitadc65725004c8aac16392fe4052c3e347181157d (patch)
tree01f6119b01516f50953d5b4a1f3cfdb44bf6742a /src/librustc_interface
parentcaa231d998a5e853c7ba1455d7a05b500df9d63c (diff)
parentb24de8f0f861781cd83018ad43d7aa9dd2cb55bb (diff)
downloadrust-adc65725004c8aac16392fe4052c3e347181157d.tar.gz
rust-adc65725004c8aac16392fe4052c3e347181157d.zip
Auto merge of #68034 - Centril:rollup-3d9pq14, r=Centril
Rollup of 12 pull requests

Successful merges:

 - #67630 (Treat extern statics just like statics in the "const pointer to static" representation)
 - #67747 (Explain that associated types and consts can't be accessed directly on the trait's path)
 - #67884 (Fix incremental builds of core by allowing unused attribute.)
 - #67966 (Use matches macro in libcore and libstd)
 - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)
 - #67986 (Display more informative ICE)
 - #67990 (slice patterns: harden match-based borrowck tests)
 - #68005 (Improve E0184 explanation)
 - #68009 (Spell check librustc_error_codes)
 - #68023 (Fix issue #68008)
 - #68024 (Remove `-Z continue-parse-after-error`)
 - #68026 (Small improvements in lexical_region_resolve)

Failed merges:

r? @ghost
Diffstat (limited to 'src/librustc_interface')
-rw-r--r--src/librustc_interface/passes.rs3
-rw-r--r--src/librustc_interface/tests.rs4
2 files changed, 0 insertions, 7 deletions
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index 432f79bba03..6e776e7d554 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -54,7 +54,6 @@ use std::rc::Rc;
 use std::{env, fs, iter, mem};
 
 pub fn parse<'a>(sess: &'a Session, input: &Input) -> PResult<'a, ast::Crate> {
-    sess.diagnostic().set_continue_after_error(sess.opts.debugging_opts.continue_parse_after_error);
     let krate = sess.time("parsing", || match input {
         Input::File(file) => parse_crate_from_file(file, &sess.parse_sess),
         Input::Str { input, name } => {
@@ -62,8 +61,6 @@ pub fn parse<'a>(sess: &'a Session, input: &Input) -> PResult<'a, ast::Crate> {
         }
     })?;
 
-    sess.diagnostic().set_continue_after_error(true);
-
     if sess.opts.debugging_opts.ast_json_noexpand {
         println!("{}", json::as_json(&krate));
     }
diff --git a/src/librustc_interface/tests.rs b/src/librustc_interface/tests.rs
index 25ab7650b0e..c2e9c35fcd4 100644
--- a/src/librustc_interface/tests.rs
+++ b/src/librustc_interface/tests.rs
@@ -602,10 +602,6 @@ fn test_debugging_options_tracking_hash() {
     assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
 
     opts = reference.clone();
-    opts.debugging_opts.continue_parse_after_error = true;
-    assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());
-
-    opts = reference.clone();
     opts.debugging_opts.force_overflow_checks = Some(true);
     assert!(reference.dep_tracking_hash() != opts.dep_tracking_hash());