From 8e2ce6ded284018b7d45ba97102f26d20cfbaee7 Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <jolesen@mozilla.com>
Date: Wed, 22 Nov 2017 11:35:03 -0800
Subject: [PATCH] Revert "Enable pager in cton-util."

This reverts commit 0538615ccc0b600d4f534dae2ee966d5ed0df9b7.

Fixes #196. The pager functionality wasn't working as intended since
long error messages appear on stdout which isn't captured by the pager.
---
 cranelift/Cargo.toml       |  3 ---
 cranelift/src/cton-util.rs | 18 ------------------
 2 files changed, 21 deletions(-)

diff --git a/cranelift/Cargo.toml b/cranelift/Cargo.toml
index b328febdd0..45b39ef0a3 100644
--- a/cranelift/Cargo.toml
+++ b/cranelift/Cargo.toml
@@ -26,9 +26,6 @@ num_cpus = "1.5.1"
 tempdir="0.3.5"
 term = "0.4.6"
 
-[target.'cfg(unix)'.dependencies]
-pager = "0.13.0"
-
 [workspace]
 
 # Enable debug assertions and parallel compilation when building cretonne-tools
diff --git a/cranelift/src/cton-util.rs b/cranelift/src/cton-util.rs
index 15eb250f5e..b08fa8cde3 100644
--- a/cranelift/src/cton-util.rs
+++ b/cranelift/src/cton-util.rs
@@ -10,17 +10,11 @@ extern crate num_cpus;
 extern crate tempdir;
 extern crate term;
 
-#[cfg(unix)]
-extern crate pager;
-
 use cretonne::VERSION;
 use docopt::Docopt;
 use std::io::{self, Write};
 use std::process;
 
-#[cfg(unix)]
-use pager::Pager;
-
 mod utils;
 mod filetest;
 mod cat;
@@ -113,19 +107,7 @@ fn cton_util() -> CommandResult {
     }
 }
 
-#[cfg(unix)]
-fn enable_pager() {
-    Pager::new().skip_on_notty().setup();
-}
-
-#[cfg(not(unix))]
-fn enable_pager() {
-    // For now, pager only supports unix-type platforms.
-}
-
 fn main() {
-    enable_pager();
-
     if let Err(mut msg) = cton_util() {
         if !msg.ends_with('\n') {
             msg.push('\n');