Skip to content

Commit e62fff4

Browse files
committed
Merge remote-tracking branch 'origin/main' into bohdan/charon-crypto
2 parents cd681cc + 2d94b22 commit e62fff4

12 files changed

Lines changed: 1099 additions & 43 deletions

File tree

.dockerignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.git
2+
.githooks
3+
.gitignore
4+
.github
5+
.envrc
6+
.direnv
7+
.vscode
8+
.idea
9+
10+
debug
11+
target
12+
13+
*.pdb
14+
**/*.rs.bk
15+
lcov.info
16+
17+
*.md

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

.githooks/pre-push

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
set -e
2+
set -e
33

44
# Dependency sorting
55
if ! cargo sort --workspace --check; then

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
.vscode
33
.idea
44

5+
# Direnv
6+
.direnv
7+
58
# Rust/Cargo
69
debug/
710
target/
8-
# TODO(template) Cargo.lock should be tracked in binary crates, but not in libraries
9-
Cargo.lock
1011

1112
# MSVC Windows builds of rustc generate these, which store debugging information
1213
*.pdb
@@ -15,4 +16,4 @@ Cargo.lock
1516
**/*.rs.bk
1617

1718
# Code coverage output
18-
lcov.info
19+
lcov.info

0 commit comments

Comments
 (0)