Skip to content

Commit 0058009

Browse files
committed
Fix make format and codespell
1 parent a1ebfba commit 0058009

File tree

8 files changed

+28
-19
lines changed

8 files changed

+28
-19
lines changed

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[codespell]
22
builtin = clear,rare,en-GB_to_en-US,names,informal,code
33
check-hidden =
4-
skip = ./.git,./build/*,./stagedir/*,*.log,.*.swp,*~,*.bak,Makefile
4+
skip = ./.git,./build/*,./stagedir/*,./docs/html/*,./docs/latex/*,*.log,.*.swp,*~,*.bak,Makefile
55
quiet-level = 2
66
# ignore-words = .ignore-words

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endif
1616

1717
CXX_FLAGS = -g
1818
SANITIZER = release
19-
SOURCEDIR = $(shell pwd)
19+
SOURCEDIR = $(CURDIR)
2020
BUILDROOT = build
2121
BUILD = $(BUILDROOT)/$(SANITIZER)
2222
EXAMPLE = beman.execution26.examples.stop_token
@@ -83,14 +83,15 @@ check:
8383
< $$h sed -n "/^ *# *include <Beman\//s@.*[</]Beman/\(.*\).hpp>.*@$$from \1@p"; \
8484
done | tsort > /dev/null
8585

86-
clang-tidy: build/debug/compile_commands.json
87-
run-clang-tidy-17 -p build/debug tests
86+
clang-tidy: build/$(SANITIZER)/compile_commands.json
87+
run-clang-tidy -p build/$(SANITIZER) tests
8888

8989
codespell:
9090
codespell -L statics,snd,copyable,cancelled
9191

9292
format:
93-
clang-format -i `git diff --name-only main | egrep '\.[ch]pp'`
93+
cmake-format -i `git diff --name-only main | egrep '(CMakeLists.txt|\.cmake)'`
94+
git clang-format main
9495

9596
todo:
9697
bin/mk-todo.py

docs/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ PROJECT_LOGO = docs/beman-logo.png
6868
# entered, it will be relative to the location where doxygen was started. If
6969
# left blank the current directory will be used.
7070

71-
OUTPUT_DIRECTORY =
71+
OUTPUT_DIRECTORY = docs
7272

7373
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
7474
# sub-directories (in 2 levels) under the output directory of each output format

examples/CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44
# cmake-format: on
55

6-
list(APPEND EXAMPLES sender-demo when_all-cancel stop_token stopping allocator)
6+
list(
7+
APPEND
8+
EXAMPLES
9+
sender-demo
10+
when_all-cancel
11+
stop_token
12+
stopping
13+
allocator
14+
)
715

816
foreach(EXAMPLE ${EXAMPLES})
917
set(EXAMPLE_TARGET ${TARGET_PREFIX}.examples.${EXAMPLE})

include/beman/execution26/detail/basic_sender.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct basic_sender : ::beman::execution26::detail::product_type<Tag, Data, Chil
3939

4040
private:
4141
template <typename Receiver>
42-
requires(not ::beman::execution26::receiver<Receiver>)
42+
requires(not::beman::execution26::receiver<Receiver>)
4343
auto connect(Receiver receiver) = BEMAN_EXECUTION26_DELETE("the passed receiver doesn't model receiver");
4444
#if __cpp_explicit_this_parameter < 202110L
4545
template <::beman::execution26::receiver Receiver>

include/beman/execution26/detail/default_domain.hpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ struct default_domain {
2525
::std::forward<Env>(env)...);
2626
}
2727
static constexpr auto transform_sender(Sender&& sender, Env&&... env) noexcept(
28-
noexcept(::beman::execution26::tag_of_t<Sender>().transform_sender(
29-
::std::forward<Sender>(sender), ::std::forward<Env>(env)...))) -> ::beman::execution26::sender
30-
decltype(auto) {
28+
noexcept(::beman::execution26::tag_of_t<Sender>().transform_sender(::std::forward<Sender>(sender),
29+
::std::forward<Env>(env)...)))
30+
-> ::beman::execution26::sender decltype(auto) {
3131
return ::beman::execution26::tag_of_t<Sender>().transform_sender(::std::forward<Sender>(sender),
3232
::std::forward<Env>(env)...);
3333
}
@@ -37,8 +37,9 @@ struct default_domain {
3737
::beman::execution26::tag_of_t<Sender>().transform_sender(::std::forward<Sender>(sender),
3838
::std::forward<Env>(env)...);
3939
})
40-
static constexpr auto transform_sender(Sender&& sender, Env&&...) noexcept(
41-
noexcept(::std::forward<Sender>(sender))) -> ::beman::execution26::sender decltype(auto) {
40+
static constexpr auto transform_sender(Sender&& sender,
41+
Env&&...) noexcept(noexcept(::std::forward<Sender>(sender)))
42+
-> ::beman::execution26::sender decltype(auto) {
4243
return ::std::forward<Sender>(sender);
4344
}
4445

@@ -55,9 +56,9 @@ struct default_domain {
5556

5657
template <::beman::execution26::sender Sender, ::beman::execution26::detail::queryable Env>
5758
requires(not requires(Sender&& sender, Env&& env) {
58-
::beman::execution26::tag_of_t<Sender>().transform_env(::std::forward<Sender>(sender),
59-
::std::forward<Env>(env));
60-
})
59+
::beman::execution26::tag_of_t<Sender>().transform_env(::std::forward<Sender>(sender),
60+
::std::forward<Env>(env));
61+
})
6162
static constexpr auto transform_env(Sender&&, Env&& env) noexcept -> ::beman::execution26::detail::queryable
6263
decltype(auto) {
6364
return static_cast<Env>(::std::forward<Env>(env));

include/beman/execution26/detail/get_domain.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ struct get_domain_t {
1616
requires(not requires(Object&& object, const get_domain_t& tag) {
1717
::std::forward<Object>(object).query(tag);
1818
}) && (not requires(Object&& object, const get_domain_t& tag) { ::std::as_const(object).query(tag); })
19-
auto
20-
operator()(Object&&) const noexcept = BEMAN_EXECUTION26_DELETE("object needs a query(get_domain_t) overload");
19+
auto operator()(Object&&) const noexcept = BEMAN_EXECUTION26_DELETE("object needs a query(get_domain_t) overload");
2120
template <typename Object>
2221
requires(not requires(Object&& object, const get_domain_t& tag) { ::std::as_const(object).query(tag); })
2322
auto

include/beman/execution26/detail/schedule_from.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ struct impls_for<::beman::execution26::detail::schedule_from_t> : ::beman::execu
8080
auto set_value() && noexcept -> void {
8181
::std::visit(
8282
[this]<typename Tuple>(Tuple& result) noexcept -> void {
83-
if constexpr (not ::std::same_as<::std::monostate, Tuple>) {
83+
if constexpr (not::std::same_as<::std::monostate, Tuple>) {
8484
::std::apply([this](auto&& tag,
8585
auto&&... args) { tag(std::move(state->receiver), std::move(args)...); },
8686
result);

0 commit comments

Comments
 (0)