Correct inlcude order

seqan · Nov 18, 2020 · 68f8db7 · 68f8db7
1 parent d07d9ec
commit 68f8db7
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 40 deletions.
diff --git a/include/seqan3/argument_parser/argument_parser.hpp b/include/seqan3/argument_parser/argument_parser.hpp
@@ -29,9 +29,9 @@
 #include <seqan3/argument_parser/detail/terminal.hpp>
 #include <seqan3/argument_parser/detail/version_check.hpp>
 #include <seqan3/core/debug_stream/detail/to_string.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/test_accessor.hpp>
 #include <seqan3/io/stream/concept.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/alignment_file/format_bam.hpp b/include/seqan3/io/alignment_file/format_bam.hpp
@@ -21,7 +21,6 @@
 #include <seqan3/alphabet/detail/convert.hpp>
 #include <seqan3/alphabet/nucleotide/sam_dna16.hpp>
 #include <seqan3/core/bit_manipulation.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/concept/core_language.hpp>
 #include <seqan3/core/concept/tuple.hpp>
 #include <seqan3/core/debug_stream/detail/to_string.hpp>
@@ -44,6 +43,7 @@
 #include <seqan3/range/views/slice.hpp>
 #include <seqan3/range/views/take_exactly.hpp>
 #include <seqan3/range/views/take_until.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/alignment_file/format_sam.hpp b/include/seqan3/io/alignment_file/format_sam.hpp
@@ -19,7 +19,6 @@
 #include <string>
 #include <vector>
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/concept/core_language.hpp>
 #include <seqan3/core/concept/tuple.hpp>
 #include <seqan3/core/debug_stream/detail/to_string.hpp>
@@ -46,6 +45,7 @@
 #include <seqan3/range/views/take_until.hpp>
 #include <seqan3/range/views/to_char.hpp>
 #include <seqan3/range/views/to.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/alignment_file/format_sam_base.hpp b/include/seqan3/io/alignment_file/format_sam_base.hpp
@@ -20,7 +20,6 @@
 #include <string>
 #include <vector>
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/concept/core_language.hpp>
 #include <seqan3/core/concept/tuple.hpp>
 #include <seqan3/core/debug_stream/detail/to_string.hpp>
@@ -47,6 +46,7 @@
 #include <seqan3/range/views/to_char.hpp>
 #include <seqan3/range/views/to.hpp>
 #include <seqan3/range/views/zip.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/utility/detail/type_name_as_string.hpp>
 
 namespace seqan3::detail

diff --git a/include/seqan3/io/alignment_file/sam_tag_dictionary.hpp b/include/seqan3/io/alignment_file/sam_tag_dictionary.hpp
@@ -12,14 +12,14 @@
 
 #pragma once
 
+#include <seqan3/std/concepts>
 #include <map>
 #include <variant>
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/concept/core_language.hpp>
 #include <seqan3/core/type_traits/template_inspection.hpp>
 #include <seqan3/range/container/small_string.hpp>
-#include <seqan3/std/concepts>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3::detail
 {

diff --git a/include/seqan3/io/sequence_file/format_embl.hpp b/include/seqan3/io/sequence_file/format_embl.hpp
@@ -12,13 +12,14 @@
 
 #pragma once
 
+#include <seqan3/std/algorithm>
 #include <iterator>
+#include <seqan3/std/ranges>
 #include <string>
 #include <string_view>
 #include <vector>
 
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/type_traits/range.hpp>
 #include <seqan3/io/detail/misc.hpp>
 #include <seqan3/io/sequence_file/input_format_concept.hpp>
@@ -33,8 +34,7 @@
 #include <seqan3/range/views/to_char.hpp>
 #include <seqan3/range/views/take_line.hpp>
 #include <seqan3/range/views/take_until.hpp>
-#include <seqan3/std/algorithm>
-#include <seqan3/std/ranges>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/sequence_file/format_fasta.hpp b/include/seqan3/io/sequence_file/format_fasta.hpp
@@ -12,15 +12,16 @@
 
 #pragma once
 
+#include <seqan3/std/algorithm>
 #include <iterator>
+#include <seqan3/std/ranges>
 #include <string>
 #include <string_view>
 #include <vector>
 
 #include <seqan3/alphabet/adaptation/char.hpp>
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
 #include <seqan3/alphabet/quality/aliases.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/type_traits/range.hpp>
 #include <seqan3/io/detail/ignore_output_iterator.hpp>
 #include <seqan3/io/detail/misc.hpp>
@@ -38,8 +39,7 @@
 #include <seqan3/range/views/take_exactly.hpp>
 #include <seqan3/range/views/take_line.hpp>
 #include <seqan3/range/views/take_until.hpp>
-#include <seqan3/std/algorithm>
-#include <seqan3/std/ranges>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/sequence_file/format_fastq.hpp b/include/seqan3/io/sequence_file/format_fastq.hpp
@@ -12,15 +12,16 @@
 
 #pragma once
 
+#include <seqan3/std/algorithm>
 #include <iterator>
+#include <seqan3/std/ranges>
 #include <string>
 #include <string_view>
 #include <vector>
 
 #include <seqan3/alphabet/adaptation/char.hpp>
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
 #include <seqan3/alphabet/quality/aliases.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/type_traits/range.hpp>
 #include <seqan3/io/detail/ignore_output_iterator.hpp>
 #include <seqan3/io/detail/misc.hpp>
@@ -37,8 +38,7 @@
 #include <seqan3/range/views/take_exactly.hpp>
 #include <seqan3/range/views/take_line.hpp>
 #include <seqan3/range/views/take_until.hpp>
-#include <seqan3/std/algorithm>
-#include <seqan3/std/ranges>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/sequence_file/format_genbank.hpp b/include/seqan3/io/sequence_file/format_genbank.hpp
@@ -12,15 +12,17 @@
 
 #pragma once
 
+#include <seqan3/std/algorithm>
+#include <seqan3/std/charconv>
 #include <iterator>
 #include <string>
+#include <seqan3/std/ranges>
 #include <string_view>
 #include <vector>
 
 #include <range/v3/view/chunk.hpp>
 
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/type_traits/range.hpp>
 #include <seqan3/io/detail/misc.hpp>
 #include <seqan3/io/sequence_file/input_format_concept.hpp>
@@ -36,9 +38,7 @@
 #include <seqan3/range/views/take.hpp>
 #include <seqan3/range/views/take_line.hpp>
 #include <seqan3/range/views/take_until.hpp>
-#include <seqan3/std/algorithm>
-#include <seqan3/std/charconv>
-#include <seqan3/std/ranges>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/io/structure_file/format_vienna.hpp b/include/seqan3/io/structure_file/format_vienna.hpp
@@ -12,8 +12,10 @@
 
 #pragma once
 
+#include <seqan3/std/algorithm>
 #include <cstdio>
 #include <iterator>
+#include <seqan3/std/ranges>
 #include <stack>
 #include <string>
 #include <string_view>
@@ -22,7 +24,6 @@
 
 #include <seqan3/alphabet/adaptation/char.hpp>
 #include <seqan3/alphabet/structure/wuss.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/type_traits/range.hpp>
 #include <seqan3/io/detail/misc.hpp>
 #include <seqan3/io/stream/iterator.hpp>
@@ -39,8 +40,7 @@
 #include <seqan3/range/views/take_until.hpp>
 #include <seqan3/range/views/to_char.hpp>
 #include <seqan3/range/views/to.hpp>
-#include <seqan3/std/algorithm>
-#include <seqan3/std/ranges>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 namespace seqan3
 {

diff --git a/include/seqan3/range/views/take_line.hpp b/include/seqan3/range/views/take_line.hpp
@@ -12,8 +12,8 @@
 
 #pragma once
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/range/views/take_until.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 // ============================================================================
 //  views::take_line (adaptor instance definition)

diff --git a/test/performance/range/views/view_take_until_benchmark.cpp b/test/performance/range/views/view_take_until_benchmark.cpp
@@ -13,9 +13,9 @@
 
 #include <benchmark/benchmark.h>
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/range/views/take_until.hpp>
 #include <seqan3/range/views/single_pass_input.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 // ============================================================================
 //  sequential_read

diff --git a/test/performance/utility/char_operations/char_predicate_benchmark.cpp b/test/performance/utility/char_operations/char_predicate_benchmark.cpp
@@ -11,8 +11,8 @@
 
 #include <benchmark/benchmark.h>
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/test/seqan2.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #if SEQAN3_HAS_SEQAN2
 #include <seqan/stream.h>

diff --git a/test/snippet/range/views/take_until.cpp b/test/snippet/range/views/take_until.cpp
@@ -1,10 +1,10 @@
+#include <seqan3/std/ranges>                         // for std::views::reverse
 #include <string>
 
-#include <seqan3/utility/char_operations/predicate.hpp> // for is_char
 #include <seqan3/core/debug_stream.hpp>              // for debug_stream
 #include <seqan3/range/views/single_pass_input.hpp>  // for views::single_pass_input
 #include <seqan3/range/views/take_until.hpp>         // for views::take_until*
-#include <seqan3/std/ranges>                         // for std::views::reverse
+#include <seqan3/utility/char_operations/predicate.hpp> // for is_char
 
 int main()
 {

diff --git a/test/unit/alphabet/nucleotide/dna15_test.cpp b/test/unit/alphabet/nucleotide/dna15_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/dna15.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/dna3bs_test.cpp b/test/unit/alphabet/nucleotide/dna3bs_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/dna3bs.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/dna4_test.cpp b/test/unit/alphabet/nucleotide/dna4_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/dna4.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/dna5_test.cpp b/test/unit/alphabet/nucleotide/dna5_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/rna15_test.cpp b/test/unit/alphabet/nucleotide/rna15_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/rna15.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/rna4_test.cpp b/test/unit/alphabet/nucleotide/rna4_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/rna4.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/rna5_test.cpp b/test/unit/alphabet/nucleotide/rna5_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/rna5.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/alphabet/nucleotide/sam_dna16_test.cpp b/test/unit/alphabet/nucleotide/sam_dna16_test.cpp
@@ -6,8 +6,8 @@
 // -----------------------------------------------------------------------------------------------------
 
 #include <seqan3/alphabet/nucleotide/sam_dna16.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_range.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../alphabet_constexpr_test_template.hpp"
 #include "../alphabet_test_template.hpp"

diff --git a/test/unit/range/views/istreambuf_test.cpp b/test/unit/range/views/istreambuf_test.cpp
@@ -12,7 +12,6 @@
 #include <seqan3/std/ranges>
 
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/debug_stream_alphabet.hpp>
 #include <seqan3/range/views/char_to.hpp>
 #include <seqan3/range/views/complement.hpp>
@@ -21,6 +20,7 @@
 #include <seqan3/range/views/to.hpp>
 #include <seqan3/test/expect_range_eq.hpp>
 #include <seqan3/test/tmp_filename.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 #include "../iterator_test_template.hpp"
 

diff --git a/test/unit/range/views/persist_test.cpp b/test/unit/range/views/persist_test.cpp
@@ -9,15 +9,16 @@
 
 #include <gtest/gtest.h>
 
+#include <seqan3/std/concepts>
+#include <seqan3/std/ranges>
+
 #include <range/v3/algorithm/copy.hpp>
 #include <range/v3/view/unique.hpp>
 
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/range/views/persist.hpp>
 #include <seqan3/range/views/to.hpp>
 #include <seqan3/range/concept.hpp>
-#include <seqan3/std/concepts>
-#include <seqan3/std/ranges>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 // ============================================================================
 //  test templates

diff --git a/test/unit/utility/char_operations/char_predicate_test.cpp b/test/unit/utility/char_operations/char_predicate_test.cpp
@@ -14,8 +14,8 @@
 #include <seqan3/alphabet/nucleotide/dna4.hpp>
 #include <seqan3/alphabet/nucleotide/dna5.hpp>
 #include <seqan3/alphabet/nucleotide/rna5.hpp>
-#include <seqan3/utility/char_operations/predicate.hpp>
 #include <seqan3/core/detail/pack_algorithm.hpp>
+#include <seqan3/utility/char_operations/predicate.hpp>
 
 using namespace std::literals;