From f80c8ff7ff3b1eef22a3c90943f324d45d855b97 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 16 Nov 2022 07:52:11 +0200
Subject: Initial low verbosity diagnostics rework

---
 libbuild2/filesystem.txx | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libbuild2/filesystem.txx')

diff --git a/libbuild2/filesystem.txx b/libbuild2/filesystem.txx
index 7404532..7e3a773 100644
--- a/libbuild2/filesystem.txx
+++ b/libbuild2/filesystem.txx
@@ -1,8 +1,6 @@
 // file      : libbuild2/filesystem.txx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <type_traits> // is_base_of
-
 #include <libbuild2/diagnostics.hxx>
 
 namespace build2
@@ -24,7 +22,7 @@ namespace build2
         if (verb >= 2)
           text << "rm " << f;
         else if (verb)
-          text << "rm " << t;
+          print_diag ("rm", t); // T can be target or path.
       }
     };
 
@@ -65,7 +63,7 @@ namespace build2
         if (verb >= 2)
           text << "rmdir " << d;
         else if (verb)
-          text << (std::is_base_of<dir_path, T>::value ? "rmdir " : "rm ") << t;
+          print_diag ("rmdir", t); // T can be target or dir_path.
       }
     };
 
@@ -94,7 +92,7 @@ namespace build2
       {
         if (verb >= v && verb >= 2)
         {
-          text << d << " is "
+          info << d << " is "
                << (w ? "current working directory" : "not empty")
                << ", not removing";
         }
-- 
cgit v1.1