Skip to content

Commit 70ccbb2

Browse files
committed
Merge branch 'adjustments-for-cargo'
2 parents 3e27550 + 13c4fef commit 70ccbb2

File tree

64 files changed

+672
-1293
lines changed

Some content is hidden

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

64 files changed

+672
-1293
lines changed

Diff for: Cargo.lock

+11-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-5
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ git-features = { version = "^0.24.1", path = "git-features" }
8989
git-repository = { version = "^0.29.0", path = "git-repository", default-features = false }
9090

9191
clap = { version = "3.2.5", features = ["derive", "cargo"] }
92-
prodash = { version = "21.1", optional = true, default-features = false }
92+
prodash = { version = "22.0", optional = true, default-features = false }
9393
is-terminal = { version = "0.4.0", optional = true }
9494
env_logger = { version = "0.10.0", default-features = false }
9595
crosstermion = { version = "0.10.1", optional = true, default-features = false }
@@ -180,10 +180,6 @@ members = [
180180

181181
"cargo-smart-release",
182182

183-
"experiments/object-access",
184-
"experiments/diffing",
185-
"experiments/traversal",
186-
187183
"tests/tools",
188184
]
189185
exclude = ["cargo-smart-release/tests/fixtures/tri-depth-workspace/a",

Diff for: DEVELOPMENT.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ A bunch of notes collected to keep track of what's needed to eventually support
188188
- Use `Context` when potential optional data is required to perform an operation at all. See `git_config::path::Context` as reference. It can't be defaulted and the
189189
fields could also be parameters.
190190

191-
## Examples, Experiments, Porcelain CLI and Plumbing CLI - which does what?
191+
## Examples, Porcelain CLI and Plumbing CLI - which does what?
192192

193193
### Plumbing vs Porcelain
194194

@@ -222,7 +222,7 @@ _Experiments_ are the quickest ways to obtain some insights. _Examples_ are mate
222222
the polish (or the potential) to move up to _plumbing_ or _porcelain_. _Plumbing_ is programs for use in scripts, whereas _porcelain_ is for use
223223
by humans.
224224

225-
* **Experiments**
225+
* **Experiments** (out of tree due to `git2` builds sometimes failing CI)
226226
* quick, potentially one-off programs to learn about an aspect of gitoxide potentially in comparison to other implementations like `libgit2`.
227227
* No need for tests of any kind, but it must compile and be idiomatic Rust and `gitoxide`.
228228
* Manual command-line parsing is OK

Diff for: Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,6 @@ check: ## Build all code in suitable configurations
134134
&& cargo check --no-default-features
135135
cd git-odb && cargo check --features serde1
136136
cd cargo-smart-release && cargo check --all
137-
cd experiments/object-access && cargo check
138-
cd experiments/diffing && cargo check
139-
cd experiments/traversal && cargo check
140137

141138
unit-tests: ## run all unit tests
142139
cargo test --all

Diff for: etc/check-package-size.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ echo "in root: gitoxide CLI"
4040
(enter git-ref && indent cargo diet -n --package-size-limit 50KB)
4141
(enter git-diff && indent cargo diet -n --package-size-limit 10KB)
4242
(enter git-traverse && indent cargo diet -n --package-size-limit 10KB)
43-
(enter git-url && indent cargo diet -n --package-size-limit 20KB)
43+
(enter git-url && indent cargo diet -n --package-size-limit 25KB)
4444
(enter git-validate && indent cargo diet -n --package-size-limit 5KB)
4545
(enter git-date && indent cargo diet -n --package-size-limit 15KB)
4646
(enter git-hashtable && indent cargo diet -n --package-size-limit 5KB)
@@ -58,6 +58,6 @@ echo "in root: gitoxide CLI"
5858
(enter git-odb && indent cargo diet -n --package-size-limit 130KB)
5959
(enter git-protocol && indent cargo diet -n --package-size-limit 80KB)
6060
(enter git-packetline && indent cargo diet -n --package-size-limit 35KB)
61-
(enter git-repository && indent cargo diet -n --package-size-limit 230KB)
61+
(enter git-repository && indent cargo diet -n --package-size-limit 240KB)
6262
(enter git-transport && indent cargo diet -n --package-size-limit 70KB)
6363
(enter gitoxide-core && indent cargo diet -n --package-size-limit 100KB)

Diff for: experiments/.gitignore

-1
This file was deleted.

Diff for: experiments/diffing/Cargo.toml

-15
This file was deleted.

Diff for: experiments/diffing/README.md

-9
This file was deleted.

0 commit comments

Comments
 (0)