From 72fc2fd27e8ca9ddd6dad7f1c8f508e115aa2b60 Mon Sep 17 00:00:00 2001 From: Kane York Date: Sat, 1 Aug 2020 15:32:00 -0700 Subject: fix(3p/nix): revert "apply all clang-tidy fixes" This reverts commit ef54f5da9fa30b5c302f2a49595ee5d041f9706a. Resolved conflicts: third_party/nix/src/libexpr/eval.cc third_party/nix/src/libstore/builtins/fetchurl.cc third_party/nix/src/libstore/references.cc third_party/nix/src/libutil/hash.cc third_party/nix/src/nix-daemon/nix-daemon.cc Change-Id: Ib9cf6e96a79a23bde3983579ced3f92e530cb011 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1547 Reviewed-by: glittershark Tested-by: BuildkiteCI --- third_party/nix/src/libutil/json.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/nix/src/libutil/json.cc') diff --git a/third_party/nix/src/libutil/json.cc b/third_party/nix/src/libutil/json.cc index 59ff74f5796f..da636e7be9c3 100644 --- a/third_party/nix/src/libutil/json.cc +++ b/third_party/nix/src/libutil/json.cc @@ -18,7 +18,7 @@ void toJSON(std::ostream& str, const char* start, const char* end) { str << "\\t"; } else if (*i >= 0 && *i < 32) { str << "\\u" << std::setfill('0') << std::setw(4) << std::hex - << static_cast(*i) << std::dec; + << (uint16_t)*i << std::dec; } else { str << *i; } -- cgit 1.4.1