Skip to content

Commit 5757bc0

Browse files
committed
Merge remote-tracking branch 'origin/main' into breaking-changes
2 parents 09243be + 8078c51 commit 5757bc0

File tree

644 files changed

+39330
-25257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

644 files changed

+39330
-25257
lines changed

.gitattributes

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
book/cli/**/*.md linguist-vendored
2+
book/cli/cli.md -linguist-vendored
3+
14
crates/storage/libmdbx-rs/mdbx-sys/** linguist-vendored

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
cache-on-failure: true
3030
- run:
31-
cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }}"
31+
cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }}" --lib --tests --benches --examples
3232
env:
3333
RUSTFLAGS: -D warnings
3434

@@ -47,7 +47,7 @@ jobs:
4747
- uses: actions/checkout@v4
4848
- uses: dtolnay/rust-toolchain@master
4949
with:
50-
toolchain: "1.70" # MSRV
50+
toolchain: "1.75" # MSRV
5151
- uses: Swatinem/rust-cache@v2
5252
with:
5353
cache-on-failure: true

.github/workflows/sanity.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: dtolnay/rust-toolchain@nightly
2323
- uses: taiki-e/install-action@cargo-udeps
2424
- name: Check for unused dependencies
25-
run: cargo udeps --features "jemalloc,${{ matrix.network }}"
25+
run: cargo udeps --lib --features "jemalloc,${{ matrix.network }}"
2626
- uses: JasonEtco/create-an-issue@v2
2727
if: ${{ failure() }}
2828
env:

.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ target/
99
# MSVC Windows builds of rustc generate these, which store debugging information
1010
*.pdb
1111

12-
1312
# Generated by Intellij-based IDEs.
1413
.idea
1514

@@ -43,5 +42,8 @@ lcov.info
4342
# Generated by ./etc/generate-jwt.sh
4443
jwttoken/
4544

45+
# Cache directory for CCLS, if using it with MDBX sources
46+
.ccls-cache/
47+
4648
# Generated by CMake due to MDBX sources
4749
crates/storage/libmdbx-rs/mdbx-sys/libmdbx/cmake-build-debug

CONTRIBUTING.md

+5
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ There are fundamentally three ways an individual can contribute:
3939
**Anybody can participate in any stage of contribution**. We urge you to participate in the discussion around bugs and
4040
participate in reviewing PRs.
4141

42+
### Contributions Related to Spelling and Grammar
43+
44+
At this time, we will not be accepting contributions that only fix spelling or grammatical errors in documentation, code or
45+
elsewhere.
46+
4247
### Asking for help
4348

4449
<!-- If you have reviewed existing documentation and still have questions, or you are having problems, you can get help in the following ways: -->

0 commit comments

Comments
 (0)