Skip to content

Use quotes rather than brackets on internal includes #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use quotes rather than brackets on internal includes #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e23eb7c
Use quotes rather than brackets on internal includes
zmbc Feb 11, 2025
f91ce8f
Merge remote-tracking branch 'upstream/main' into quotes_on_internal_…
zmbc Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bench/bench-fuzz.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <benchmark/benchmark.h>
#include <rapidfuzz/fuzz.hpp>
#include "benchmark/benchmark.h"
#include "rapidfuzz/fuzz.hpp"
#include <string>
#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions bench/bench-jarowinkler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <benchmark/benchmark.h>
#include "benchmark/benchmark.h"
#include <random>
#include <rapidfuzz/distance/Jaro.hpp>
#include "rapidfuzz/distance/Jaro.hpp"
#include <string>
#include <vector>

Expand Down
6 changes: 3 additions & 3 deletions bench/bench-lcs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <benchmark/benchmark.h>
#include "benchmark/benchmark.h"
#include <random>
#include <rapidfuzz/details/intrinsics.hpp>
#include <rapidfuzz/distance/LCSseq.hpp>
#include "rapidfuzz/details/intrinsics.hpp"
#include "rapidfuzz/distance/LCSseq.hpp"
#include <string>
#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions bench/bench-levenshtein.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <benchmark/benchmark.h>
#include "benchmark/benchmark.h"
#include <random>
#include <rapidfuzz/distance/Levenshtein.hpp>
#include "rapidfuzz/distance/Levenshtein.hpp"
#include <string>
#include <vector>

Expand Down
4 changes: 2 additions & 2 deletions fuzzing/fuzz_damerau_levenshtein_distance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../rapidfuzz_reference/DamerauLevenshtein.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/DamerauLevenshtein.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/DamerauLevenshtein.hpp"
#include <stdexcept>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion fuzzing/fuzz_indel_distance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../rapidfuzz_reference/Indel.hpp"
#include "fuzzing.hpp"
#include <limits>
#include <rapidfuzz/distance/Indel.hpp>
#include "rapidfuzz/distance/Indel.hpp"
#include <stdexcept>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion fuzzing/fuzz_indel_editops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "../rapidfuzz_reference/Indel.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/distance.hpp>
#include "rapidfuzz/distance.hpp"
#include <stdexcept>
#include <string>

Expand Down
4 changes: 2 additions & 2 deletions fuzzing/fuzz_jaro_similarity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../rapidfuzz_reference/Jaro.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/Jaro.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/Jaro.hpp"
#include <stdexcept>
#include <string>

Expand Down
4 changes: 2 additions & 2 deletions fuzzing/fuzz_lcs_similarity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../rapidfuzz_reference/LCSseq.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/LCSseq.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/LCSseq.hpp"
#include <stdexcept>
#include <string>

Expand Down
4 changes: 2 additions & 2 deletions fuzzing/fuzz_levenshtein_distance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../rapidfuzz_reference/Levenshtein.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/Levenshtein.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/Levenshtein.hpp"
#include <stdexcept>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion fuzzing/fuzz_levenshtein_editops.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "../rapidfuzz_reference/Levenshtein.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/distance.hpp>
#include "rapidfuzz/distance.hpp"
#include <stdexcept>
#include <string>

Expand Down
4 changes: 2 additions & 2 deletions fuzzing/fuzz_osa_distance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "../rapidfuzz_reference/OSA.hpp"
#include "fuzzing.hpp"
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/OSA.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/OSA.hpp"
#include <stdexcept>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion fuzzing/fuzz_partial_ratio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../rapidfuzz_reference/fuzz.hpp"
#include "fuzzing.hpp"
#include <cstdint>
#include <rapidfuzz/fuzz.hpp>
#include "rapidfuzz/fuzz.hpp"
#include <stdexcept>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion fuzzing/fuzzing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <iostream>
#include <rapidfuzz/distance/Levenshtein.hpp>
#include "rapidfuzz/distance/Levenshtein.hpp"
#include <vector>

static inline bool extract_strings(const uint8_t* data, size_t size, std::vector<uint8_t>& s1,
Expand Down
8 changes: 4 additions & 4 deletions rapidfuzz/details/PatternMatchVector.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#include <stdint.h>
#include <stdio.h>

#include <rapidfuzz/details/GrowingHashmap.hpp>
#include <rapidfuzz/details/Matrix.hpp>
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/intrinsics.hpp>
#include "rapidfuzz/details/GrowingHashmap.hpp"
#include "rapidfuzz/details/Matrix.hpp"
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/intrinsics.hpp"

namespace rapidfuzz {
namespace detail {
Expand Down
2 changes: 1 addition & 1 deletion rapidfuzz/details/Range.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <sys/types.h>
#include <vector>

#include <rapidfuzz/details/type_traits.hpp>
#include "rapidfuzz/details/type_traits.hpp"

namespace rapidfuzz {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/details/SplittedSentenceView.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#include <algorithm>
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/type_traits.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/type_traits.hpp"

namespace rapidfuzz {
namespace detail {
Expand Down
12 changes: 6 additions & 6 deletions rapidfuzz/details/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

#pragma once
#include <cstring>
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/SplittedSentenceView.hpp>
#include <rapidfuzz/details/intrinsics.hpp>
#include <rapidfuzz/details/type_traits.hpp>
#include <rapidfuzz/details/types.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/SplittedSentenceView.hpp"
#include "rapidfuzz/details/intrinsics.hpp"
#include "rapidfuzz/details/type_traits.hpp"
#include "rapidfuzz/details/types.hpp"

#if defined(__APPLE__) && !defined(_LIBCPP_HAS_C11_FEATURES)
# include <mm_malloc.h>
Expand Down Expand Up @@ -98,4 +98,4 @@ static inline void rf_aligned_free(void* ptr)
} // namespace detail
} // namespace rapidfuzz

#include <rapidfuzz/details/common_impl.hpp>
#include "rapidfuzz/details/common_impl.hpp"
6 changes: 3 additions & 3 deletions rapidfuzz/details/distance.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#pragma once

#include <cmath>
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/common.hpp>
#include <rapidfuzz/details/simd.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/common.hpp"
#include "rapidfuzz/details/simd.hpp"
#include <type_traits>

namespace rapidfuzz {
Expand Down
2 changes: 1 addition & 1 deletion rapidfuzz/details/intrinsics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <cassert>
#include <cstddef>
#include <limits>
#include <rapidfuzz/details/config.hpp>
#include "rapidfuzz/details/config.hpp"
#include <stdint.h>
#include <type_traits>

Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/details/simd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
# define RAPIDFUZZ_SIMD
# define RAPIDFUZZ_AVX2
# define RAPIDFUZZ_LTO_HACK 0
# include <rapidfuzz/details/simd_avx2.hpp>
# include "rapidfuzz/details/simd_avx2.hpp"

# elif (defined(_M_AMD64) || defined(_M_X64)) || defined(__SSE2__)
# define RAPIDFUZZ_SIMD
# define RAPIDFUZZ_SSE2
# define RAPIDFUZZ_LTO_HACK 1
# include <rapidfuzz/details/simd_sse2.hpp>
# include "rapidfuzz/details/simd_sse2.hpp"
# endif
#endif
2 changes: 1 addition & 1 deletion rapidfuzz/details/simd_avx2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <array>
#include <immintrin.h>
#include <ostream>
#include <rapidfuzz/details/intrinsics.hpp>
#include "rapidfuzz/details/intrinsics.hpp"
#include <stdint.h>

namespace rapidfuzz {
Expand Down
2 changes: 1 addition & 1 deletion rapidfuzz/details/simd_sse2.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <array>
#include <emmintrin.h>
#include <ostream>
#include <rapidfuzz/details/intrinsics.hpp>
#include "rapidfuzz/details/intrinsics.hpp"
#include <stdint.h>

namespace rapidfuzz {
Expand Down
2 changes: 1 addition & 1 deletion rapidfuzz/details/type_traits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* Copyright © 2020 Max Bachmann */

#pragma once
#include <rapidfuzz/details/types.hpp>
#include "rapidfuzz/details/types.hpp"

#include <iterator>
#include <utility>
Expand Down
2 changes: 1 addition & 1 deletion rapidfuzz/details/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#pragma once

#include <algorithm>
#include <rapidfuzz/details/config.hpp>
#include "rapidfuzz/details/config.hpp"
#include <stddef.h>
#include <stdexcept>
#include <vector>
Expand Down
20 changes: 10 additions & 10 deletions rapidfuzz/distance.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
/* Copyright © 2022-present Max Bachmann */

#pragma once
#include <rapidfuzz/distance/DamerauLevenshtein.hpp>
#include <rapidfuzz/distance/Hamming.hpp>
#include <rapidfuzz/distance/Indel.hpp>
#include <rapidfuzz/distance/Jaro.hpp>
#include <rapidfuzz/distance/JaroWinkler.hpp>
#include <rapidfuzz/distance/LCSseq.hpp>
#include <rapidfuzz/distance/Levenshtein.hpp>
#include <rapidfuzz/distance/OSA.hpp>
#include <rapidfuzz/distance/Postfix.hpp>
#include <rapidfuzz/distance/Prefix.hpp>
#include "rapidfuzz/distance/DamerauLevenshtein.hpp"
#include "rapidfuzz/distance/Hamming.hpp"
#include "rapidfuzz/distance/Indel.hpp"
#include "rapidfuzz/distance/Jaro.hpp"
#include "rapidfuzz/distance/JaroWinkler.hpp"
#include "rapidfuzz/distance/LCSseq.hpp"
#include "rapidfuzz/distance/Levenshtein.hpp"
#include "rapidfuzz/distance/OSA.hpp"
#include "rapidfuzz/distance/Postfix.hpp"
#include "rapidfuzz/distance/Prefix.hpp"

namespace rapidfuzz {

Expand Down
2 changes: 1 addition & 1 deletion rapidfuzz/distance/DamerauLevenshtein.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* Copyright © 2022-present Max Bachmann */

#include <algorithm>
#include <rapidfuzz/distance/DamerauLevenshtein_impl.hpp>
#include "rapidfuzz/distance/DamerauLevenshtein_impl.hpp"

namespace rapidfuzz {
/* the API will require a change when adding custom weights */
Expand Down
10 changes: 5 additions & 5 deletions rapidfuzz/distance/DamerauLevenshtein_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include <cstddef>
#include <limits>
#include <numeric>
#include <rapidfuzz/details/GrowingHashmap.hpp>
#include <rapidfuzz/details/Matrix.hpp>
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/common.hpp>
#include <rapidfuzz/details/distance.hpp>
#include "rapidfuzz/details/GrowingHashmap.hpp"
#include "rapidfuzz/details/Matrix.hpp"
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/common.hpp"
#include "rapidfuzz/details/distance.hpp"

namespace rapidfuzz {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/distance/Hamming.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#pragma once
#include <limits>
#include <rapidfuzz/details/common.hpp>
#include <rapidfuzz/distance/Hamming_impl.hpp>
#include "rapidfuzz/details/common.hpp"
#include "rapidfuzz/distance/Hamming_impl.hpp"

namespace rapidfuzz {

Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/distance/Hamming_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* Copyright © 2021 Max Bachmann */

#pragma once
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/distance.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/distance.hpp"
#include <stdexcept>

namespace rapidfuzz {
Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/distance/Indel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#pragma once

#include <limits>
#include <rapidfuzz/distance/Indel_impl.hpp>
#include <rapidfuzz/distance/LCSseq.hpp>
#include "rapidfuzz/distance/Indel_impl.hpp"
#include "rapidfuzz/distance/LCSseq.hpp"

namespace rapidfuzz {

Expand Down
12 changes: 6 additions & 6 deletions rapidfuzz/distance/Indel_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* SPDX-License-Identifier: MIT */
/* Copyright © 2022-present Max Bachmann */

#include <rapidfuzz/details/PatternMatchVector.hpp>
#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/details/common.hpp>
#include <rapidfuzz/details/distance.hpp>
#include <rapidfuzz/details/intrinsics.hpp>
#include <rapidfuzz/distance/LCSseq.hpp>
#include "rapidfuzz/details/PatternMatchVector.hpp"
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/details/common.hpp"
#include "rapidfuzz/details/distance.hpp"
#include "rapidfuzz/details/intrinsics.hpp"
#include "rapidfuzz/distance/LCSseq.hpp"

namespace rapidfuzz {
namespace detail {
Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/distance/Jaro.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#pragma once

#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/Jaro_impl.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/Jaro_impl.hpp"
#include <stdlib.h>

namespace rapidfuzz {
Expand Down
4 changes: 2 additions & 2 deletions rapidfuzz/distance/JaroWinkler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#pragma once

#include <rapidfuzz/details/Range.hpp>
#include <rapidfuzz/distance/JaroWinkler_impl.hpp>
#include "rapidfuzz/details/Range.hpp"
#include "rapidfuzz/distance/JaroWinkler_impl.hpp"

namespace rapidfuzz {

Expand Down
Loading
Loading