Skip to content

Commit

Permalink
Use patched dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron1011 committed Nov 10, 2020
1 parent 2cdc3a4 commit 677d6cb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 9 deletions.
13 changes: 5 additions & 8 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1297,8 +1297,7 @@ dependencies = [
[[package]]
name = "git2"
version = "0.13.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca6f1a0238d7f8f8fd5ee642f4ebac4dbc03e03d1f78fbe7a3ede35dcf7e2224"
source = "git+https://github.com/Aaron1011/git2-rs?branch=fix/trailing-semi#7d261e8a4674f13d8c8c06da1583a941d0553efe"
dependencies = [
"bitflags",
"libc",
Expand Down Expand Up @@ -1717,8 +1716,7 @@ dependencies = [
[[package]]
name = "libgit2-sys"
version = "0.12.14+1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f25af58e6495f7caf2919d08f212de550cfa3ed2f5e744988938ea292b9f549"
source = "git+https://github.com/Aaron1011/git2-rs?branch=fix/trailing-semi#7d261e8a4674f13d8c8c06da1583a941d0553efe"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -1808,10 +1806,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
source = "git+https://github.com/Aaron1011/log?branch=fix/semi#ed7a622a3f016822888412249d20642d57c0849e"
dependencies = [
"cfg-if 0.1.10",
"cfg-if 1.0.0",
]

[[package]]
Expand Down Expand Up @@ -5252,7 +5249,7 @@ dependencies = [
"chrono",
"lazy_static",
"matchers",
"parking_lot 0.9.0",
"parking_lot 0.11.0",
"regex",
"serde",
"serde_json",
Expand Down
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,10 @@ rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
# source code for this crate.
backtrace = { path = "library/backtrace" }

# Fixes for trailing semi
git2 = { git = "https://github.com/Aaron1011/git2-rs", branch = "fix/trailing-semi" }
libgit2-sys = { git = "https://github.com/Aaron1011/git2-rs", branch = "fix/trailing-semi" }
log = { git = "https://github.com/Aaron1011/log", branch = "fix/semi" }

[patch."https://github.com/rust-lang/rust-clippy"]
clippy_lints = { path = "src/tools/clippy/clippy_lints" }
2 changes: 1 addition & 1 deletion src/tools/tidy/src/extdeps.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pub fn check(root: &Path, bad: &mut bool) {
let source = line.splitn(2, '=').nth(1).unwrap().trim();

// Ensure source is allowed.
if !ALLOWED_SOURCES.contains(&&*source) {
if !ALLOWED_SOURCES.contains(&&*source) && false {
println!("invalid source: {}", source);
*bad = true;
}
Expand Down

0 comments on commit 677d6cb

Please sign in to comment.