From 9da8f5e25d835e3bd1cc4280f2b69cfa4ab8d774 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Tue, 31 Aug 2021 08:02:04 -0400 Subject: [PATCH] path antiquotations: canonizePath -> canonicalizePath --- src/libexpr/eval.cc | 4 ++-- src/libexpr/eval.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index a8bfa7711..ce3a626d3 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -1794,7 +1794,7 @@ std::optional EvalState::tryAttrsToString(const Pos & pos, Value & v, } string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context, - bool coerceMore, bool copyToStore, bool canonizePath) + bool coerceMore, bool copyToStore, bool canonicalizePath) { forceValue(v, pos); @@ -1806,7 +1806,7 @@ string EvalState::coerceToString(const Pos & pos, Value & v, PathSet & context, } if (v.type() == nPath) { - Path path(canonizePath ? canonPath(v.path) : v.path); + Path path(canonicalizePath ? canonPath(v.path) : v.path); return copyToStore ? copyPathToStore(context, path) : path; } diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index ad6fb7ff4..af000072a 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -218,7 +218,7 @@ public: referenced paths are copied to the Nix store as a side effect. */ string coerceToString(const Pos & pos, Value & v, PathSet & context, bool coerceMore = false, bool copyToStore = true, - bool canonizePath = true); + bool canonicalizePath = true); string copyPathToStore(PathSet & context, const Path & path);