nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

refactor(libutil): remove showBytes() in favor of renderSize()

Browse source 
The `showBytes()` function was redundant with `renderSize()` as the
latter automatically selects the appropriate unit (KiB, MiB, GiB, etc.)
based on the value, whereas `showBytes()` always formatted as MiB
regardless of size.

Co-authored-by: Bernardo Meurer Costa <beme@anthropic.com>
This commit is contained in:
Marcel 2025-10-27 00:55:40 +01:00
parent 9d4d10954a
commit f234633e27
No known key found for this signature in database
GPG key ID: 446F3B093DF81C6A
5 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libmain/include/nix/main/shared.hh
View file

@ -89,8 +89,6 @@ extern volatile ::sig_atomic_t blockInt;
/* GC helpers. */ /* GC helpers. */
std::string showBytes(uint64_t bytes);
struct GCResults; struct GCResults;
struct PrintFreed struct PrintFreed

2
src/libmain/shared.cc
View file

@ -406,7 +406,7 @@ RunPager::~RunPager()
PrintFreed::~PrintFreed() PrintFreed::~PrintFreed()
{ {
if (show) if (show)
std::cout << fmt("%d store paths deleted, %s freed\n", results.paths.size(), showBytes(results.bytesFreed)); std::cout << fmt("%d store paths deleted, %s freed\n", results.paths.size(), renderSize(results.bytesFreed));
} }
} // namespace nix } // namespace nix

2
src/libstore/optimise-store.cc
View file

@ -312,7 +312,7 @@ void LocalStore::optimiseStore()
optimiseStore(stats); optimiseStore(stats);
printInfo("%s freed by hard-linking %d files", showBytes(stats.bytesFreed), stats.filesLinked); printInfo("%s freed by hard-linking %d files", renderSize(stats.bytesFreed), stats.filesLinked);
} }
void LocalStore::optimisePath(const Path & path, RepairFlag repair) void LocalStore::optimisePath(const Path & path, RepairFlag repair)

2
src/libutil/include/nix/util/util.hh
View file

@ -333,8 +333,6 @@ struct overloaded : Ts...
template<class... Ts> template<class... Ts>
overloaded(Ts...) -> overloaded<Ts...>; overloaded(Ts...) -> overloaded<Ts...>;
std::string showBytes(uint64_t bytes);
/** /**
* Provide an addition operator between strings and string_views * Provide an addition operator between strings and string_views
* inexplicably omitted from the standard library. * inexplicably omitted from the standard library.

5
src/libutil/util.cc
View file

@ -257,9 +257,4 @@ std::pair<std::string_view, std::string_view> getLine(std::string_view s)
} }
} }
std::string showBytes(uint64_t bytes)
{
return fmt("%.2f MiB", bytes / (1024.0 * 1024.0));
}
} // namespace nix } // namespace nix