Skip to content

Commit 46b5282

Browse files
authored
Rollup merge of #54050 - GabrielMajeri:fix-build-with-nightly, r=alexcrichton
Update `petgraph` dependency to 0.4.13 to fix build with nightly I wanted to build Rust from source using a local nightly compiler, but I was unable to get `bootstrap` to compile due to a naming conflict with the `find_map` function. This PR updates the `petgraph` dependency of `bootstrap` to 0.4.13, fixing the issue.
2 parents 80f8e1f + b31eaa4 commit 46b5282

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ dependencies = [
138138
"lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
139139
"libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
140140
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
141-
"petgraph 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
141+
"petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
142142
"pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
143143
"serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
144144
"serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1471,7 +1471,7 @@ dependencies = [
14711471

14721472
[[package]]
14731473
name = "petgraph"
1474-
version = "0.4.12"
1474+
version = "0.4.13"
14751475
source = "registry+https://github.com/rust-lang/crates.io-index"
14761476
dependencies = [
14771477
"fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3244,7 +3244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
32443244
"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
32453245
"checksum pest 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0fce5d8b5cc33983fc74f78ad552b5522ab41442c4ca91606e4236eb4b5ceefc"
32463246
"checksum pest_derive 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ab94faafeb93f4c5e3ce81ca0e5a779529a602ad5d09ae6d21996bfb8b6a52bf"
3247-
"checksum petgraph 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "8b30dc85588cd02b9b76f5e386535db546d21dc68506cff2abebee0b6445e8e4"
3247+
"checksum petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3659d1ee90221741f65dd128d9998311b0e40c5d3c23a62445938214abce4f"
32483248
"checksum phf 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "7d37a244c75a9748e049225155f56dbcb98fe71b192fd25fd23cb914b5ad62f2"
32493249
"checksum phf_codegen 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "4e4048fe7dd7a06b8127ecd6d3803149126e9b33c7558879846da3a63f734f2b"
32503250
"checksum phf_generator 0.7.22 (registry+https://github.com/rust-lang/crates.io-index)" = "05a079dd052e7b674d21cb31cbb6c05efd56a2cd2827db7692e2f1a507ebd998"

src/bootstrap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ serde_json = "1.0.2"
4747
toml = "0.4"
4848
lazy_static = "0.2"
4949
time = "0.1"
50-
petgraph = "0.4.12"
50+
petgraph = "0.4.13"
5151

5252
[dev-dependencies]
5353
pretty_assertions = "0.5"

0 commit comments

Comments
 (0)