Scrape out remaining bits of -Zast

Author: spinda

src/librustc/session/config.rs

@@ -862,10 +862,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "print the arguments passed to the linker"),
     print_llvm_passes: bool = (false, parse_bool, [UNTRACKED],
         "prints the llvm optimization passes being run"),
-    ast: bool = (false, parse_bool, [UNTRACKED],
-        "pretty-print the AST and halt"),
-    ast_noexpand: bool = (false, parse_bool, [UNTRACKED],
-        "pretty-print the pre-expansion AST and halt"),
     ast_json: bool = (false, parse_bool, [UNTRACKED],
         "print the AST as JSON and halt"),
     ast_json_noexpand: bool = (false, parse_bool, [UNTRACKED],

src/librustc_driver/driver.rs

@@ -501,10 +501,6 @@ pub fn phase_1_parse_input<'a>(sess: &'a Session, input: &Input) -> PResult<'a,
 
     sess.diagnostic().set_continue_after_error(true);
 
-    if sess.opts.debugging_opts.ast_noexpand {
-        println!("{:#?}", &krate);
-    }
-
     if sess.opts.debugging_opts.ast_json_noexpand {
         println!("{}", json::as_json(&krate));
     }
@@ -737,10 +733,6 @@ pub fn phase_2_configure_and_expand<F>(sess: &Session,
         hir_stats::print_ast_stats(&krate, "POST EXPANSION AST STATS");
     }
 
-    if sess.opts.debugging_opts.ast {
-        println!("{:#?}", &krate);
-    }
-
     if sess.opts.debugging_opts.ast_json {
         println!("{}", json::as_json(&krate));
     }

src/librustc_driver/lib.rs

@@ -484,13 +484,11 @@ impl<'a> CompilerCalls<'a> for RustcDefaultCalls {
 
         if sess.opts.debugging_opts.parse_only ||
            sess.opts.debugging_opts.show_span.is_some() ||
-           sess.opts.debugging_opts.ast_noexpand ||
            sess.opts.debugging_opts.ast_json_noexpand {
             control.after_parse.stop = Compilation::Stop;
         }
 
         if sess.opts.debugging_opts.no_analysis ||
-           sess.opts.debugging_opts.ast ||
            sess.opts.debugging_opts.ast_json {
             control.after_hir_lowering.stop = Compilation::Stop;
         }