Skip to content
This repository was archived by the owner on Nov 26, 2024. It is now read-only.

Commit 2f5a915

Browse files
committed
build: update configs
1 parent 27b7b75 commit 2f5a915

File tree

18 files changed

+119
-98
lines changed

18 files changed

+119
-98
lines changed

.gitattributes

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,12 @@
1-
* text=auto
1+
[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
2+
3+
* text=auto eol=lf
4+
*.c rust
5+
*.cpp rust
6+
*.fixed linguist-language=rust
7+
*.h rust
8+
*.lock -diff -merge
9+
*.lock linguist-generated=false
10+
*.mir linguist-language=rust
11+
*.rs rust diff=rust
12+
*.toml linguist-language=toml

.githooks/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ set -o errexit
55
set -o pipefail
66
set -o nounset
77

8-
cat ${1} | make conventional-commits-linter
8+
cat "${1}" | make conventional-commits-linter

.githooks/pre-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ for FILE in $(git diff --name-status --staged \
1414
| grep --invert-match "D" \
1515
| grep --invert-match "R" \
1616
| cut -d " " -f 2); do
17-
git add ${FILE}
17+
git add "${FILE}"
1818
done

.github/workflows/pull_request-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
target/
9999
-
100100
name: Conventional Commits
101-
run: ./script/conventional-commits-linter.sh ${{ github.event.pull_request.head.ref }}
101+
run: ./script/conventional-commits-linter.sh
102102
shell: bash
103103
timeout-minutes: 30
104104
deny-check:

Cargo.lock

Lines changed: 50 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,18 @@ version = "0.4.0"
577577
source = "registry+https://github.com/rust-lang/crates.io-index"
578578
checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
579579

580+
[[package]]
581+
name = "flume"
582+
version = "0.10.9"
583+
source = "registry+https://github.com/rust-lang/crates.io-index"
584+
checksum = "24c3fd473b3a903a62609e413ed7538f99e10b665ecb502b5e481a95283f8ab4"
585+
dependencies = [
586+
"futures-core",
587+
"futures-sink",
588+
"pin-project",
589+
"spin 0.9.2",
590+
]
591+
580592
[[package]]
581593
name = "fnv"
582594
version = "1.0.7"
@@ -805,13 +817,13 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
805817

806818
[[package]]
807819
name = "http"
808-
version = "0.2.5"
820+
version = "0.2.6"
809821
source = "registry+https://github.com/rust-lang/crates.io-index"
810-
checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b"
822+
checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03"
811823
dependencies = [
812824
"bytes",
813825
"fnv",
814-
"itoa 0.4.8",
826+
"itoa 1.0.1",
815827
]
816828

817829
[[package]]
@@ -976,9 +988,9 @@ checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
976988

977989
[[package]]
978990
name = "libsqlite3-sys"
979-
version = "0.22.2"
991+
version = "0.23.2"
980992
source = "registry+https://github.com/rust-lang/crates.io-index"
981-
checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d"
993+
checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58"
982994
dependencies = [
983995
"cc",
984996
"pkg-config",
@@ -1274,18 +1286,18 @@ dependencies = [
12741286

12751287
[[package]]
12761288
name = "pin-project"
1277-
version = "1.0.8"
1289+
version = "1.0.9"
12781290
source = "registry+https://github.com/rust-lang/crates.io-index"
1279-
checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
1291+
checksum = "1622113ce508488160cff04e6abc60960e676d330e1ca0f77c0b8df17c81438f"
12801292
dependencies = [
12811293
"pin-project-internal",
12821294
]
12831295

12841296
[[package]]
12851297
name = "pin-project-internal"
1286-
version = "1.0.8"
1298+
version = "1.0.9"
12871299
source = "registry+https://github.com/rust-lang/crates.io-index"
1288-
checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389"
1300+
checksum = "b95af56fee93df76d721d356ac1ca41fccf168bc448eb14049234df764ba3e76"
12891301
dependencies = [
12901302
"proc-macro2",
12911303
"quote",
@@ -1341,9 +1353,9 @@ dependencies = [
13411353

13421354
[[package]]
13431355
name = "proc-macro2"
1344-
version = "1.0.34"
1356+
version = "1.0.36"
13451357
source = "registry+https://github.com/rust-lang/crates.io-index"
1346-
checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
1358+
checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
13471359
dependencies = [
13481360
"unicode-xid",
13491361
]
@@ -1403,9 +1415,9 @@ dependencies = [
14031415

14041416
[[package]]
14051417
name = "quote"
1406-
version = "1.0.10"
1418+
version = "1.0.14"
14071419
source = "registry+https://github.com/rust-lang/crates.io-index"
1408-
checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
1420+
checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
14091421
dependencies = [
14101422
"proc-macro2",
14111423
]
@@ -1589,7 +1601,7 @@ dependencies = [
15891601
"cc",
15901602
"libc",
15911603
"once_cell",
1592-
"spin",
1604+
"spin 0.5.2",
15931605
"untrusted",
15941606
"web-sys",
15951607
"winapi",
@@ -1740,6 +1752,15 @@ version = "0.5.2"
17401752
source = "registry+https://github.com/rust-lang/crates.io-index"
17411753
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
17421754

1755+
[[package]]
1756+
name = "spin"
1757+
version = "0.9.2"
1758+
source = "registry+https://github.com/rust-lang/crates.io-index"
1759+
checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5"
1760+
dependencies = [
1761+
"lock_api",
1762+
]
1763+
17431764
[[package]]
17441765
name = "sqlformat"
17451766
version = "0.1.8"
@@ -1753,19 +1774,19 @@ dependencies = [
17531774

17541775
[[package]]
17551776
name = "sqlx"
1756-
version = "0.5.9"
1777+
version = "0.5.10"
17571778
source = "registry+https://github.com/rust-lang/crates.io-index"
1758-
checksum = "7911b0031a0247af40095838002999c7a52fba29d9739e93326e71a5a1bc9d43"
1779+
checksum = "692749de69603d81e016212199d73a2e14ee20e2def7d7914919e8db5d4d48b9"
17591780
dependencies = [
17601781
"sqlx-core",
17611782
"sqlx-macros",
17621783
]
17631784

17641785
[[package]]
17651786
name = "sqlx-core"
1766-
version = "0.5.9"
1787+
version = "0.5.10"
17671788
source = "registry+https://github.com/rust-lang/crates.io-index"
1768-
checksum = "aec89bfaca8f7737439bad16d52b07f1ccd0730520d3bf6ae9d069fe4b641fb1"
1789+
checksum = "518be6f6fff5ca76f985d434f9c37f3662af279642acf730388f271dff7b9016"
17691790
dependencies = [
17701791
"ahash",
17711792
"atoi",
@@ -1776,14 +1797,16 @@ dependencies = [
17761797
"crossbeam-queue",
17771798
"crossbeam-utils",
17781799
"either",
1800+
"flume",
17791801
"futures-channel",
17801802
"futures-core",
1803+
"futures-executor",
17811804
"futures-intrusive",
17821805
"futures-util",
17831806
"hashlink",
17841807
"hex",
17851808
"indexmap",
1786-
"itoa 0.4.8",
1809+
"itoa 1.0.1",
17871810
"libc",
17881811
"libsqlite3-sys",
17891812
"log",
@@ -1801,14 +1824,13 @@ dependencies = [
18011824
"url",
18021825
"webpki",
18031826
"webpki-roots",
1804-
"whoami",
18051827
]
18061828

18071829
[[package]]
18081830
name = "sqlx-macros"
1809-
version = "0.5.9"
1831+
version = "0.5.10"
18101832
source = "registry+https://github.com/rust-lang/crates.io-index"
1811-
checksum = "584866c833511b1a152e87a7ee20dee2739746f60c858b3c5209150bc4b466f5"
1833+
checksum = "38e45140529cf1f90a5e1c2e561500ca345821a1c513652c8f486bbf07407cc8"
18121834
dependencies = [
18131835
"dotenv",
18141836
"either",
@@ -1824,9 +1846,9 @@ dependencies = [
18241846

18251847
[[package]]
18261848
name = "sqlx-rt"
1827-
version = "0.5.9"
1849+
version = "0.5.10"
18281850
source = "registry+https://github.com/rust-lang/crates.io-index"
1829-
checksum = "0d1bd069de53442e7a320f525a6d4deb8bb0621ac7a55f7eccbc2b58b57f43d0"
1851+
checksum = "8061cbaa91ee75041514f67a09398c65a64efed72c90151ecd47593bad53da99"
18301852
dependencies = [
18311853
"once_cell",
18321854
"tokio",
@@ -1851,9 +1873,9 @@ dependencies = [
18511873

18521874
[[package]]
18531875
name = "syn"
1854-
version = "1.0.83"
1876+
version = "1.0.84"
18551877
source = "registry+https://github.com/rust-lang/crates.io-index"
1856-
checksum = "23a1dfb999630e338648c83e91c59a4e9fb7620f520c3194b6b89e276f2f1959"
1878+
checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b"
18571879
dependencies = [
18581880
"proc-macro2",
18591881
"quote",
@@ -2218,9 +2240,9 @@ dependencies = [
22182240

22192241
[[package]]
22202242
name = "tracing-subscriber"
2221-
version = "0.3.4"
2243+
version = "0.3.5"
22222244
source = "registry+https://github.com/rust-lang/crates.io-index"
2223-
checksum = "d5e6136799e1079699e0d9784c883e03af55cf6a1bee48fe1d79ca552c1bc36f"
2245+
checksum = "5d81bfa81424cc98cb034b837c985b7a290f592e5b4322f353f94a0ab0f9f594"
22242246
dependencies = [
22252247
"lazy_static",
22262248
"matchers",
@@ -2467,16 +2489,6 @@ dependencies = [
24672489
"libc",
24682490
]
24692491

2470-
[[package]]
2471-
name = "whoami"
2472-
version = "1.2.1"
2473-
source = "registry+https://github.com/rust-lang/crates.io-index"
2474-
checksum = "524b58fa5a20a2fb3014dd6358b70e6579692a56ef6fce928834e488f42f65e8"
2475-
dependencies = [
2476-
"wasm-bindgen",
2477-
"web-sys",
2478-
]
2479-
24802492
[[package]]
24812493
name = "winapi"
24822494
version = "0.3.9"

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ incremental = false
4040
# inline-threshold
4141
# link-arg
4242
# link-args
43-
# link-dead-code
43+
link-dead-code = false
4444
# link-self-contained
4545
# linker
4646
# linker-flavor
@@ -73,7 +73,7 @@ rpath = false
7373
[profile.dev]
7474
# code-model
7575
# code-model
76-
codegen-units = 256
76+
codegen-units = 1
7777
# control-flow-guard
7878
debug = true
7979
debug-assertions = true
@@ -87,7 +87,7 @@ incremental = true
8787
# inline-threshold
8888
# link-arg
8989
# link-args
90-
# link-dead-code
90+
link-dead-code = true
9191
# link-self-contained
9292
# linker
9393
# linker-flavor
@@ -102,7 +102,7 @@ lto = false
102102
# no-vectorize-slp
103103
opt-level = 0
104104
overflow-checks = true
105-
panic = "unwind"
105+
panic = "abort"
106106
# passes
107107
# prefer-dynamic
108108
# profile-generate
@@ -120,7 +120,7 @@ rpath = false
120120
[profile.test]
121121
# code-model
122122
# code-model
123-
codegen-units = 256
123+
codegen-units = 1
124124
# control-flow-guard
125125
debug = true
126126
debug-assertions = true
@@ -134,7 +134,7 @@ incremental = true
134134
# inline-threshold
135135
# link-arg
136136
# link-args
137-
# link-dead-code
137+
link-dead-code = true
138138
# link-self-contained
139139
# linker
140140
# linker-flavor
@@ -149,7 +149,7 @@ lto = false
149149
# no-vectorize-slp
150150
opt-level = 0
151151
overflow-checks = true
152-
panic = "unwind"
152+
panic = "abort"
153153
# passes
154154
# prefer-dynamic
155155
# profile-generate
@@ -180,7 +180,7 @@ incremental = false
180180
# inline-threshold
181181
# link-arg
182182
# link-args
183-
# link-dead-code
183+
link-dead-code = false
184184
# link-self-contained
185185
# linker
186186
# linker-flavor

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ conventional-commits-linter: add-conventional-commits-linter ## Conventional com
230230
conventional_commits_linter --allow-angular-type-only --from-stdin
231231

232232
.PHONY: coverage
233-
coverage: NIGHTLY = +nightly
233+
# coverage: NIGHTLY = +nightly
234234
coverage: add-fmt add-grcov add-llvm-tools-preview add-nightly-toolchain clean-coverage fetch ## Coverage
235235
mkdir -p $(COVERAGE_DIR)
236236
mkdir -p coverage
237-
RUSTFLAGS="-Zinstrument-coverage" $(CARGO_BUILD)
238-
RUSTFLAGS="-Zinstrument-coverage" LLVM_PROFILE_FILE="$(PACKAGE)-%p-%m.profraw" $(CARGO_TEST)
237+
RUSTC_BOOTSTRAP=1 RUSTFLAGS="-Zinstrument-coverage -Zpanic_abort_tests" $(CARGO_BUILD)
238+
RUSTC_BOOTSTRAP=1 RUSTFLAGS="-Zinstrument-coverage -Zpanic_abort_tests" LLVM_PROFILE_FILE="$(PACKAGE)-%p-%m.profraw" $(CARGO_TEST)
239239
ifeq ("$(GRCOV_COVERAGE_TYPE)", "cobertura")
240240
grcov . \
241241
--binary-path $(BIN_DIR) \

0 commit comments

Comments
 (0)