From c56cbd0f6bed17602dd7dc893473d7cc98a72305 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathandturner@users.noreply.github.com>
Date: Tue, 23 Jun 2020 11:51:06 -0700
Subject: [PATCH] Cleanup header to work like before (#2039)

---
 Cargo.lock                   | 6 +++---
 crates/nu-table/src/table.rs | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a44529ad8..b162703ad5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4617,12 +4617,12 @@ dependencies = [
 
 [[package]]
 name = "which"
-version = "3.1.1"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
+checksum = "b5fe1a9cb33fe7cf77d431070d0223e544b1e4e7f7764bad0a3e691a6678a131"
 dependencies = [
- "failure",
  "libc",
+ "thiserror",
 ]
 
 [[package]]
diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs
index ebd7edb02f..f266de1f3c 100644
--- a/crates/nu-table/src/table.rs
+++ b/crates/nu-table/src/table.rs
@@ -406,7 +406,10 @@ impl WrappedTable {
             self.print_separator(SeparatorPosition::Top);
         }
 
-        if !self.headers.is_empty() {
+        let skip_headers = (self.headers.len() == 2 && self.headers[1].max_width == 0)
+            || (self.headers.len() == 1 && self.headers[0].max_width == 0);
+
+        if !self.headers.is_empty() && !skip_headers {
             self.print_cell_contents(&self.headers);
         }
 
@@ -420,7 +423,7 @@ impl WrappedTable {
             } else {
                 first_row = false;
 
-                if self.theme.separate_header && !self.headers.is_empty() {
+                if self.theme.separate_header && !self.headers.is_empty() && !skip_headers {
                     self.print_separator(SeparatorPosition::Middle);
                 }
             }