From 80fc7b569ce01da361c160ce98686655fab4aa64 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sat, 4 May 2019 16:23:53 +0200 Subject: [PATCH] Use crates.io version of ar again --- Cargo.lock | 8 ++++---- Cargo.toml | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cfa87b421b4e..9c125d1a3249 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,8 +18,8 @@ dependencies = [ [[package]] name = "ar" -version = "0.6.2" -source = "git+https://github.com/bjorn3/rust-ar.git?branch=non_multiple_of_two_identifiers_gnu_format#efa2308b9ded41f4977d4fed98dac7af4d9075cf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -582,7 +582,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "rustc_codegen_cranelift" version = "0.1.0" dependencies = [ - "ar 0.6.2 (git+https://github.com/bjorn3/rust-ar.git?branch=non_multiple_of_two_identifiers_gnu_format)", + "ar 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "cranelift 0.30.0 (git+https://github.com/CraneStation/cranelift.git)", @@ -843,7 +843,7 @@ dependencies = [ [metadata] "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum ar 0.6.2 (git+https://github.com/bjorn3/rust-ar.git?branch=non_multiple_of_two_identifiers_gnu_format)" = "" +"checksum ar 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6c1afd66a96a235fa8eeec0ee757ec0d2c0db7cb89b4e04ae159f37952b97bd5" "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" diff --git a/Cargo.toml b/Cargo.toml index c4ee9056d9ed..c823278cb39f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ target-lexicon = "0.4.0" faerie = "0.10.0" #goblin = "0.0.17" -ar = "0.6.1" +ar = "0.7.0" bitflags = "1.0.3" byteorder = "1.2.7" libc = "0.2.53" @@ -38,8 +38,5 @@ indexmap = "1.0.2" #[patch."https://github.com/gimli-rs/gimli.git"] #gimli = { path = "../" } -[patch.crates-io] -ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "non_multiple_of_two_identifiers_gnu_format" } - [profile.dev.overrides."*"] opt-level = 3