Skip to content

Commit

Permalink
nix: update flake lock
Browse files Browse the repository at this point in the history
This comes with some formatting changes due to a `clang-format` update.
  • Loading branch information
JakeHillion committed Aug 13, 2024
1 parent 8306c37 commit ed5fcfe
Show file tree
Hide file tree
Showing 8 changed files with 91 additions and 82 deletions.
8 changes: 4 additions & 4 deletions extern/shim-folly-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define _FOLLY_CONFIG_H 1

#ifdef __APPLE__
#include <TargetConditionals.h> // @manual
#include <TargetConditionals.h> // @manual
#endif

#include <time.h>
Expand All @@ -31,7 +31,7 @@
#else
#define FOLLY_MOBILE 0
#endif
#endif // FOLLY_MOBILE
#endif // FOLLY_MOBILE

/* define if the Boost library is available */
#ifndef FOLLY_HAVE_BOOST
Expand Down Expand Up @@ -387,13 +387,13 @@
#else
#define FOLLY_LIBRARY_SANITIZE_ADDRESS 0
#endif
#else // defined(__has_feature)
#else // defined(__has_feature)
#if __SANITIZE_ADDRESS__
#define FOLLY_LIBRARY_SANITIZE_ADDRESS 1
#else
#define FOLLY_LIBRARY_SANITIZE_ADDRESS 0
#endif
#endif // defined(__has_feature)
#endif // defined(__has_feature)

// We depend on JEMalloc headers in fbcode, so use them (note that when using
// sanitizers, `#ifdef` gates in the code will not use JEMalloc headers,
Expand Down
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 14 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,16 @@
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = { self, nixpkgs, flake-utils, treefmt-nix, ... }@inputs:
flake-utils.lib.eachDefaultSystem (system:
outputs =
{
self,
nixpkgs,
flake-utils,
treefmt-nix,
...
}@inputs:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
treefmtEval = treefmt-nix.lib.evalModule pkgs (pkgs: {
Expand All @@ -23,8 +31,10 @@
programs.black.enable = true;
programs.isort.enable = true;
});
in {
in
{
formatter = treefmtEval.config.build.wrapper;
checks.formatting = treefmtEval.config.build.check self;
});
}
);
}
2 changes: 1 addition & 1 deletion oi/DrgnUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func_iterator::func_iterator(drgn_program* prog) {
iter.reset(ret, Deleter());
}

func_iterator::func_iterator(program& prog) : func_iterator(prog.get()){};
func_iterator::func_iterator(program& prog) : func_iterator(prog.get()) {};

void func_iterator::Deleter::operator()(drgn_func_iterator* _iter) noexcept {
drgn_func_iterator_destroy(_iter);
Expand Down
4 changes: 2 additions & 2 deletions oi/DrgnUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class error : public std::exception {
struct Deleter {
void operator()(drgn_error* err) noexcept;
};
error(drgn_error* err) : ptr(err){};
error(drgn_error* err) : ptr(err) {};

operator bool() const {
return static_cast<bool>(ptr);
Expand All @@ -65,7 +65,7 @@ class program {
};

program();
program(drgn_program* prog) : ptr(prog){};
program(drgn_program* prog) : ptr(prog) {};

symbols find_all_symbols();

Expand Down
3 changes: 1 addition & 2 deletions oi/IntrospectionResult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,7 @@ IntrospectionResult::const_iterator::operator++() {

for (const auto& [dy, handler] : ty.processors) {
auto parsed = exporters::ParsedData::parse(data_, dy);
handler(
*next_, [this](auto i) { stack_.emplace(i); }, parsed);
handler(*next_, [this](auto i) { stack_.emplace(i); }, parsed);
}

if (auto new_name = genNameFromData(next_->data)) {
Expand Down
4 changes: 2 additions & 2 deletions oi/OILexer.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ namespace oi::detail {

class OIScanner : public yyFlexLexer {
public:
OIScanner(std::istream* in) : yyFlexLexer(in){};
OIScanner(std::istream* in) : yyFlexLexer(in) {};

virtual ~OIScanner(){};
virtual ~OIScanner() {};

// get rid of override virtual function warning
using FlexLexer::yylex;
Expand Down
Loading

0 comments on commit ed5fcfe

Please sign in to comment.