Skip to content

Commit

Permalink
change!: upgrade bstr to 1.0.1 (#450)
Browse files Browse the repository at this point in the history
  • Loading branch information
Byron committed Sep 12, 2022
1 parent 0887e2e commit 99905ba
Show file tree
Hide file tree
Showing 31 changed files with 83 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/msrv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@1.59.0 # dictated by `windows` crates effectively, IMPORTANT: adjust etc/msrv-badge.svg as well
- uses: dtolnay/rust-toolchain@1.60.0 # dictated by `windows` crates effectively, IMPORTANT: adjust etc/msrv-badge.svg as well
- run: make check-msrv-on-ci
continue-on-error: true # TODO: turn this off once the toolchain gets updated. There is a strange error preventing cargo to select the correct libgit2 version
# like it doesn't exist.
66 changes: 39 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion etc/msrv-badge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions git-actor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ doctest = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde1 = ["serde", "bstr/serde1", "git-date/serde1"]
serde1 = ["serde", "bstr/serde", "git-date/serde1"]

[dependencies]
git-features = { version = "^0.22.4", path = "../git-features", optional = true }
git-date = { version = "^0.1.0", path = "../git-date" }

quick-error = "2.0.0"
btoi = "0.4.2"
bstr = { version = "0.2.13", default-features = false, features = ["std", "unicode"]}
bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
nom = { version = "7", default-features = false, features = ["std"]}
itoa = "1.0.1"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
Expand Down
4 changes: 2 additions & 2 deletions git-attributes/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ doctest = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde1 = ["serde", "bstr/serde1", "git-glob/serde1", "compact_str/serde"]
serde1 = ["serde", "bstr/serde", "git-glob/serde1", "compact_str/serde"]

[dependencies]
git-features = { version = "^0.22.4", path = "../git-features" }
git-path = { version = "^0.4.2", path = "../git-path" }
git-quote = { version = "^0.2.1", path = "../git-quote" }
git-glob = { version = "^0.3.2", path = "../git-glob" }

bstr = { version = "0.2.13", default-features = false, features = ["std"]}
bstr = { version = "1.0.1", default-features = false, features = ["std", "unicode"]}
unicode-bom = "1.1.4"
thiserror = "1.0.26"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
Expand Down
4 changes: 2 additions & 2 deletions git-commitgraph/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ doctest = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`
serde1 = ["serde", "git-hash/serde1", "bstr/serde1"]
serde1 = ["serde", "git-hash/serde1", "bstr/serde"]

[dependencies]
git-features = { version = "^0.22.4", path = "../git-features", features = ["rustsha1"] }
git-hash = { version = "^0.9.9", path = "../git-hash" }
git-chunk = { version = "^0.3.1", path = "../git-chunk" }

bstr = { version = "0.2.13", default-features = false, features = ["std"] }
bstr = { version = "1.0.1", default-features = false, features = ["std"] }
memmap2 = "0.5.0"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
thiserror = "1.0.26"
Expand Down
4 changes: 2 additions & 2 deletions git-config-value/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ doctest = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde1 = ["serde", "bstr/serde1"]
serde1 = ["serde", "bstr/serde"]

[dependencies]
git-path = { version = "^0.4.2", path = "../git-path" }

thiserror = "1.0.32"
bstr = "0.2.17"
bstr = "1.0.1"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
bitflags = "1.3.2"

Expand Down
4 changes: 2 additions & 2 deletions git-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ include = ["src/**/*", "LICENSE-*", "README.md", "CHANGELOG.md"]

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde1 = ["serde", "bstr/serde1", "git-sec/serde1", "git-ref/serde1", "git-glob/serde1", "git-config-value/serde1"]
serde1 = ["serde", "bstr/serde", "git-sec/serde1", "git-ref/serde1", "git-glob/serde1", "git-config-value/serde1"]

[dependencies]
git-features = { version = "^0.22.4", path = "../git-features"}
Expand All @@ -26,7 +26,7 @@ nom = { version = "7", default_features = false, features = [ "std" ] }
memchr = "2"
thiserror = "1.0.26"
unicode-bom = "1.1.4"
bstr = { version = "0.2.13", default-features = false, features = ["std"] }
bstr = { version = "1.0.1", default-features = false, features = ["std"] }
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
smallvec = "1.9.0"

Expand Down
4 changes: 2 additions & 2 deletions git-credentials/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ doctest = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde1 = ["serde", "bstr/serde1", "git-sec/serde1"]
serde1 = ["serde", "bstr/serde", "git-sec/serde1"]

[dependencies]
git-sec = { version = "^0.3.1", path = "../git-sec" }
Expand All @@ -24,7 +24,7 @@ git-prompt = { version = "0.1.0", path = "../git-prompt" }

thiserror = "1.0.32"
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
bstr = { version = "0.2.13", default-features = false, features = ["std"]}
bstr = { version = "1.0.1", default-features = false, features = ["std"]}



Expand Down
4 changes: 2 additions & 2 deletions git-date/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ doctest = false

[features]
## Data structures implement `serde::Serialize` and `serde::Deserialize`.
serde1 = ["serde", "bstr/serde1"]
serde1 = ["serde", "bstr/serde"]

[dependencies]
bstr = { version = "0.2.13", default-features = false, features = ["std"]}
bstr = { version = "1.0.1", default-features = false, features = ["std"]}
serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"]}
itoa = "1.0.1"
time = { version = "0.3.2", default-features = false, features = ["local-offset", "formatting", "macros", "parsing"] }
Expand Down
Loading

0 comments on commit 99905ba

Please sign in to comment.