Attachment 199304 Details for Bug 233282 – v1

[patch] v1

racer-2.1.13.diff (text/plain), 32.97 KB, created by Jan Beich on 2018-11-18 00:05:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-11-18 00:05:15 UTC

Size: 32.97 KB

patch

obsolete

>From edf24fcf3eb993dd3e350f74b1aa8ad3fc4c3a47 Mon Sep 17 00:00:00 2001
>From: jbeich <jbeich@35697150-7ecd-e111-bb59-0022644237b5>
>Date: Mon, 24 Sep 2018 16:59:41 +0000
>Subject: [PATCH] devel/racer: update to 2.1.13
>
>Changes:	https://github.com/racer-rust/racer/compare/v2.1.5...v2.1.13
>PR:		233282
>Approved by:	Timothy Beyer (maintainer)
>---
> devel/racer/Makefile                        |  22 +-
> devel/racer/distinfo                        |  44 +--
> devel/racer/files/patch-rustc-ap-syntax-237 | 366 ++++++++++++++++++++
> 3 files changed, 394 insertions(+), 38 deletions(-)
> create mode 100644 devel/racer/files/patch-rustc-ap-syntax-237
>
>diff --git a/devel/racer/Makefile b/devel/racer/Makefile
>index cd1119c6eb03..68403a20d19d 100644
>--- a/devel/racer/Makefile
>+++ b/devel/racer/Makefile
>@@ -3,8 +3,7 @@
> 
> PORTNAME=	racer
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.1.5
>-PORTREVISION=	3
>+DISTVERSION=	2.1.13
> CATEGORIES=	devel
> 
> MAINTAINER=	beyert@cs.ucr.edu
>@@ -44,15 +43,14 @@ CARGO_CRATES=	aho-corasick-0.6.6 \
> 		crossbeam-deque-0.2.0 \
> 		crossbeam-epoch-0.3.1 \
> 		crossbeam-utils-0.2.2 \
>-		derive_more-0.11.0 \
>-		dtoa-0.4.3 \
>+		derive_more-0.13.0 \
> 		either-1.5.0 \
> 		ena-0.9.3 \
> 		env_logger-0.5.10 \
> 		fuchsia-zircon-0.3.3 \
> 		fuchsia-zircon-sys-0.3.3 \
> 		humantime-1.1.1 \
>-		itoa-0.4.2 \
>+		itoa-0.4.3 \
> 		lazy_static-1.0.1 \
> 		lazycell-1.0.0 \
> 		libc-0.2.42 \
>@@ -64,10 +62,8 @@ CARGO_CRATES=	aho-corasick-0.6.6 \
> 		owning_ref-0.3.3 \
> 		parking_lot-0.5.5 \
> 		parking_lot_core-0.2.14 \
>-		proc-macro2-0.3.8 \
>-		proc-macro2-0.4.6 \
>+		proc-macro2-0.4.20 \
> 		quick-error-1.2.2 \
>-		quote-0.5.2 \
> 		quote-0.6.3 \
> 		rand-0.4.2 \
> 		redox_syscall-0.1.40 \
>@@ -88,18 +84,18 @@ CARGO_CRATES=	aho-corasick-0.6.6 \
> 		rustc-rayon-0.1.1 \
> 		rustc-rayon-core-0.1.1 \
> 		rustc_version-0.2.2 \
>+		ryu-0.2.6 \
> 		scoped-tls-0.1.2 \
> 		scopeguard-0.3.3 \
> 		semver-0.9.0 \
> 		semver-parser-0.7.0 \
>-		serde-1.0.70 \
>-		serde_derive-1.0.70 \
>-		serde_json-1.0.22 \
>+		serde-1.0.80 \
>+		serde_derive-1.0.80 \
>+		serde_json-1.0.32 \
> 		smallvec-0.6.5 \
> 		stable_deref_trait-1.1.0 \
> 		strsim-0.7.0 \
>-		syn-0.13.11 \
>-		syn-0.14.4 \
>+		syn-0.15.17 \
> 		tempfile-3.0.2 \
> 		termcolor-0.3.6 \
> 		termion-1.5.1 \
>diff --git a/devel/racer/distinfo b/devel/racer/distinfo
>index 1c5eac5612ae..efe0172d150e 100644
>--- a/devel/racer/distinfo
>+++ b/devel/racer/distinfo
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1535362143
>+TIMESTAMP = 1542384569
> SHA256 (rust/crates/aho-corasick-0.6.6.tar.gz) = c1c6d463cbe7ed28720b5b489e7c083eeb8f90d08be2a0d6bb9e1ffea9ce1afa
> SIZE (rust/crates/aho-corasick-0.6.6.tar.gz) = 26330
> SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
>@@ -21,10 +21,8 @@ SHA256 (rust/crates/crossbeam-epoch-0.3.1.tar.gz) = 927121f5407de9956180ff5e936f
> SIZE (rust/crates/crossbeam-epoch-0.3.1.tar.gz) = 33093
> SHA256 (rust/crates/crossbeam-utils-0.2.2.tar.gz) = 2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9
> SIZE (rust/crates/crossbeam-utils-0.2.2.tar.gz) = 11901
>-SHA256 (rust/crates/derive_more-0.11.0.tar.gz) = 46c7f14685a20f5dd08e7f754f2ea8cc064d8f4214ae21116c106a2768ba7b9b
>-SIZE (rust/crates/derive_more-0.11.0.tar.gz) = 14597
>-SHA256 (rust/crates/dtoa-0.4.3.tar.gz) = 6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd
>-SIZE (rust/crates/dtoa-0.4.3.tar.gz) = 14456
>+SHA256 (rust/crates/derive_more-0.13.0.tar.gz) = 3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871
>+SIZE (rust/crates/derive_more-0.13.0.tar.gz) = 16724
> SHA256 (rust/crates/either-1.5.0.tar.gz) = 3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0
> SIZE (rust/crates/either-1.5.0.tar.gz) = 10900
> SHA256 (rust/crates/ena-0.9.3.tar.gz) = 88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621
>@@ -37,8 +35,8 @@ SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 3dcaa9ae7725d12cdb85b3ad9
> SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191
> SHA256 (rust/crates/humantime-1.1.1.tar.gz) = 0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e
> SIZE (rust/crates/humantime-1.1.1.tar.gz) = 16689
>-SHA256 (rust/crates/itoa-0.4.2.tar.gz) = 5adb58558dcd1d786b5f0bd15f3226ee23486e24b7b58304b60f64dc68e62606
>-SIZE (rust/crates/itoa-0.4.2.tar.gz) = 10581
>+SHA256 (rust/crates/itoa-0.4.3.tar.gz) = 1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b
>+SIZE (rust/crates/itoa-0.4.3.tar.gz) = 11061
> SHA256 (rust/crates/lazy_static-1.0.1.tar.gz) = e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739
> SIZE (rust/crates/lazy_static-1.0.1.tar.gz) = 11380
> SHA256 (rust/crates/lazycell-1.0.0.tar.gz) = d33a48d0365c96081958cc663eef834975cb1e8d8bea3378513fc72bdbf11e50
>@@ -61,14 +59,10 @@ SHA256 (rust/crates/parking_lot-0.5.5.tar.gz) = d4d05f1349491390b1730afba60bb20d
> SIZE (rust/crates/parking_lot-0.5.5.tar.gz) = 36889
> SHA256 (rust/crates/parking_lot_core-0.2.14.tar.gz) = 4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa
> SIZE (rust/crates/parking_lot_core-0.2.14.tar.gz) = 22140
>-SHA256 (rust/crates/proc-macro2-0.3.8.tar.gz) = 1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7
>-SIZE (rust/crates/proc-macro2-0.3.8.tar.gz) = 24412
>-SHA256 (rust/crates/proc-macro2-0.4.6.tar.gz) = effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6
>-SIZE (rust/crates/proc-macro2-0.4.6.tar.gz) = 27767
>+SHA256 (rust/crates/proc-macro2-0.4.20.tar.gz) = 3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee
>+SIZE (rust/crates/proc-macro2-0.4.20.tar.gz) = 30516
> SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0
> SIZE (rust/crates/quick-error-1.2.2.tar.gz) = 15132
>-SHA256 (rust/crates/quote-0.5.2.tar.gz) = 9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8
>-SIZE (rust/crates/quote-0.5.2.tar.gz) = 14982
> SHA256 (rust/crates/quote-0.6.3.tar.gz) = e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035
> SIZE (rust/crates/quote-0.6.3.tar.gz) = 14154
> SHA256 (rust/crates/rand-0.4.2.tar.gz) = eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5
>@@ -109,6 +103,8 @@ SHA256 (rust/crates/rustc-rayon-core-0.1.1.tar.gz) = 40f06724db71e18d68b3b946fdf
> SIZE (rust/crates/rustc-rayon-core-0.1.1.tar.gz) = 54307
> SHA256 (rust/crates/rustc_version-0.2.2.tar.gz) = a54aa04a10c68c1c4eacb4337fd883b435997ede17a9385784b990777686b09a
> SIZE (rust/crates/rustc_version-0.2.2.tar.gz) = 10200
>+SHA256 (rust/crates/ryu-0.2.6.tar.gz) = 7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7
>+SIZE (rust/crates/ryu-0.2.6.tar.gz) = 39911
> SHA256 (rust/crates/scoped-tls-0.1.2.tar.gz) = 332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28
> SIZE (rust/crates/scoped-tls-0.1.2.tar.gz) = 9079
> SHA256 (rust/crates/scopeguard-0.3.3.tar.gz) = 94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27
>@@ -117,22 +113,20 @@ SHA256 (rust/crates/semver-0.9.0.tar.gz) = 1d7eb9ef2c18661902cc47e535f9bc51b78ac
> SIZE (rust/crates/semver-0.9.0.tar.gz) = 17344
> SHA256 (rust/crates/semver-parser-0.7.0.tar.gz) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
> SIZE (rust/crates/semver-parser-0.7.0.tar.gz) = 10268
>-SHA256 (rust/crates/serde-1.0.70.tar.gz) = 0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920
>-SIZE (rust/crates/serde-1.0.70.tar.gz) = 72036
>-SHA256 (rust/crates/serde_derive-1.0.70.tar.gz) = 3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124
>-SIZE (rust/crates/serde_derive-1.0.70.tar.gz) = 46016
>-SHA256 (rust/crates/serde_json-1.0.22.tar.gz) = 84b8035cabe9b35878adec8ac5fe03d5f6bc97ff6edd7ccb96b44c1276ba390e
>-SIZE (rust/crates/serde_json-1.0.22.tar.gz) = 65154
>+SHA256 (rust/crates/serde-1.0.80.tar.gz) = 15c141fc7027dd265a47c090bf864cf62b42c4d228bbcf4e51a0c9e2b0d3f7ef
>+SIZE (rust/crates/serde-1.0.80.tar.gz) = 73057
>+SHA256 (rust/crates/serde_derive-1.0.80.tar.gz) = 225de307c6302bec3898c51ca302fc94a7a1697ef0845fcee6448f33c032249c
>+SIZE (rust/crates/serde_derive-1.0.80.tar.gz) = 47136
>+SHA256 (rust/crates/serde_json-1.0.32.tar.gz) = 43344e7ce05d0d8280c5940cabb4964bea626aa58b1ec0e8c73fa2a8512a38ce
>+SIZE (rust/crates/serde_json-1.0.32.tar.gz) = 69507
> SHA256 (rust/crates/smallvec-0.6.5.tar.gz) = 153ffa32fd170e9944f7e0838edf824a754ec4c1fc64746fcc9fe1f8fa602e5d
> SIZE (rust/crates/smallvec-0.6.5.tar.gz) = 20238
> SHA256 (rust/crates/stable_deref_trait-1.1.0.tar.gz) = ffbc596e092fe5f598b12ef46cc03754085ac2f4d8c739ad61c4ae266cc3b3fa
> SIZE (rust/crates/stable_deref_trait-1.1.0.tar.gz) = 8002
> SHA256 (rust/crates/strsim-0.7.0.tar.gz) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550
> SIZE (rust/crates/strsim-0.7.0.tar.gz) = 8435
>-SHA256 (rust/crates/syn-0.13.11.tar.gz) = 14f9bf6292f3a61d2c716723fdb789a41bbe104168e6f496dc6497e531ea1b9b
>-SIZE (rust/crates/syn-0.13.11.tar.gz) = 134240
>-SHA256 (rust/crates/syn-0.14.4.tar.gz) = 2beff8ebc3658f07512a413866875adddd20f4fd47b2a4e6c9da65cd281baaea
>-SIZE (rust/crates/syn-0.14.4.tar.gz) = 133818
>+SHA256 (rust/crates/syn-0.15.17.tar.gz) = 3391038ebc3e4ab24eb028cb0ef2f2dc4ba0cbf72ee895ed6a6fad730640b5bc
>+SIZE (rust/crates/syn-0.15.17.tar.gz) = 144532
> SHA256 (rust/crates/tempfile-3.0.2.tar.gz) = 47776f63b85777d984a50ce49d6b9e58826b6a3766a449fc95bc66cd5663c15b
> SIZE (rust/crates/tempfile-3.0.2.tar.gz) = 20825
> SHA256 (rust/crates/termcolor-0.3.6.tar.gz) = adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83
>@@ -165,5 +159,5 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c
> SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
> SHA256 (rust/crates/wincolor-0.1.6.tar.gz) = eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767
> SIZE (rust/crates/wincolor-0.1.6.tar.gz) = 4799
>-SHA256 (racer-rust-racer-v2.1.5_GH0.tar.gz) = 42ea1a168501c82bb6d3203eadfd2c1ebc80508310cd9e6d0bc92d74a6d49c91
>-SIZE (racer-rust-racer-v2.1.5_GH0.tar.gz) = 178382
>+SHA256 (racer-rust-racer-v2.1.13_GH0.tar.gz) = 18270cfeb3176c0f13e5987b8be30ebcb661be981cf0a02ffbe5e5630d3667d5
>+SIZE (racer-rust-racer-v2.1.13_GH0.tar.gz) = 191730
>diff --git a/devel/racer/files/patch-rustc-ap-syntax-237 b/devel/racer/files/patch-rustc-ap-syntax-237
>new file mode 100644
>index 000000000000..bf780369c09c
>--- /dev/null
>+++ b/devel/racer/files/patch-rustc-ap-syntax-237
>@@ -0,0 +1,366 @@
>+error[E0106]: missing lifetime specifier
>+  --> cargo-crates/rustc-ap-rustc_data_structures-297.0.0/vec_linked_list.rs:56:20
>+   |
>+56 | impl<Ls> Links for &Ls
>+   |                    ^ expected lifetime parameter
>+
>+--- Cargo.lock.orig	2018-11-16 16:09:29 UTC
>++++ Cargo.lock
>+@@ -62,14 +62,6 @@ dependencies = [
>+ ]
>+ 
>+ [[package]]
>+-name = "cloudabi"
>+-version = "0.0.3"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+-[[package]]
>+ name = "crossbeam-deque"
>+ version = "0.2.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+@@ -179,15 +171,6 @@ version = "0.2.42"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ 
>+ [[package]]
>+-name = "lock_api"
>+-version = "0.1.3"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+-[[package]]
>+ name = "log"
>+ version = "0.4.3"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+@@ -231,11 +214,11 @@ dependencies = [
>+ 
>+ [[package]]
>+ name = "parking_lot"
>+-version = "0.6.4"
>++version = "0.5.5"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+- "lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+@@ -250,18 +233,6 @@ dependencies = [
>+ ]
>+ 
>+ [[package]]
>+-name = "parking_lot_core"
>+-version = "0.3.1"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+-[[package]]
>+ name = "proc-macro2"
>+ version = "0.4.20"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+@@ -297,7 +268,7 @@ dependencies = [
>+  "racer-cargo-metadata 0.1.1",
>+  "racer-testutils 0.1.0",
>+  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-syntax 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-syntax 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+@@ -335,23 +306,6 @@ dependencies = [
>+ ]
>+ 
>+ [[package]]
>+-name = "rand"
>+-version = "0.5.5"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+-[[package]]
>+-name = "rand_core"
>+-version = "0.2.1"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-
>+-[[package]]
>+ name = "redox_syscall"
>+ version = "0.1.40"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+@@ -399,40 +353,33 @@ source = "registry+https://github.com/rust-lang/crates
>+ 
>+ [[package]]
>+ name = "rustc-ap-arena"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+-name = "rustc-ap-graphviz"
>+-version = "297.0.0"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-
>+-[[package]]
>+ name = "rustc-ap-rustc_cratesio_shim"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+ name = "rustc-ap-rustc_data_structures"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-graphviz 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_cratesio_shim 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
>+@@ -442,34 +389,31 @@ dependencies = [
>+ 
>+ [[package]]
>+ name = "rustc-ap-rustc_errors"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-syntax_pos 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-syntax_pos 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+ name = "rustc-ap-rustc_target"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_cratesio_shim 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+ name = "rustc-ap-serialize"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+@@ -477,29 +421,29 @@ dependencies = [
>+ 
>+ [[package]]
>+ name = "rustc-ap-syntax"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_errors 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_target 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-syntax_pos 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_errors 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_target 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-syntax_pos 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "smallvec 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+ [[package]]
>+ name = "rustc-ap-syntax_pos"
>+-version = "297.0.0"
>++version = "237.0.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ dependencies = [
>+  "cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-arena 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-arena 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>++ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
>+  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+@@ -646,14 +590,6 @@ dependencies = [
>+ ]
>+ 
>+ [[package]]
>+-name = "termcolor"
>+-version = "1.0.4"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+-[[package]]
>+ name = "termion"
>+ version = "1.5.1"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+@@ -733,14 +669,6 @@ version = "0.4.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+ 
>+ [[package]]
>+-name = "winapi-util"
>+-version = "0.1.1"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+-[[package]]
>+ name = "winapi-x86_64-pc-windows-gnu"
>+ version = "0.4.0"
>+ source = "registry+https://github.com/rust-lang/crates.io-index"
>+@@ -753,15 +681,6 @@ dependencies = [
>+  "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+ ]
>+ 
>+-[[package]]
>+-name = "wincolor"
>+-version = "1.0.1"
>+-source = "registry+https://github.com/rust-lang/crates.io-index"
>+-dependencies = [
>+- "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
>+- "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
>+-]
>+-
>+ [metadata]
>+ "checksum aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c6d463cbe7ed28720b5b489e7c083eeb8f90d08be2a0d6bb9e1ffea9ce1afa"
>+ "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
>+@@ -771,7 +690,6 @@ dependencies = [
>+ "checksum byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "74c0b906e9446b0a2e4f760cdb3fa4b2c48cdc6db8766a845c54b6ff063fd2e9"
>+ "checksum cfg-if 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "efe5c877e17a9c717a0bf3613b2709f723202c4e4675cc8f12926ded29bcb17e"
>+ "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
>+-"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
>+ "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
>+ "checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
>+ "checksum crossbeam-utils 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2760899e32a1d58d5abb31129f8fae5de75220bc2176e77ff7c627ae45c918d9"
>+@@ -786,37 +704,32 @@ dependencies = [
>+ "checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739"
>+ "checksum lazycell 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d33a48d0365c96081958cc663eef834975cb1e8d8bea3378513fc72bdbf11e50"
>+ "checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1"
>+-"checksum lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "949826a5ccf18c1b3a7c3d57692778d21768b79e46eb9dd07bfc4c2160036c54"
>+ "checksum log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "61bd98ae7f7b754bc53dca7d44b604f733c6bba044ea6f41bc8d89272d8161d2"
>+ "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
>+ "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
>+ "checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
>+ "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
>+ "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
>+-"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
>++"checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
>+ "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
>+-"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
>+ "checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee"
>+ "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
>+ "checksum quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e44651a0dc4cdd99f71c83b561e221f714912d11af1a4dff0631f923d53af035"
>+ "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
>+-"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
>+-"checksum rand_core 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "edecf0f94da5551fc9b492093e30b041a891657db7940ee221f9d2f66e82eef2"
>+ "checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
>+ "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
>+ "checksum regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13c93d55961981ba9226a213b385216f83ab43bd6ac53ab16b2eeb47e337cf4e"
>+ "checksum regex-syntax 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05b06a75f5217880fc5e905952a42750bf44787e56a6c6d6852ed0992f5e1d54"
>+ "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
>+ "checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a"
>+-"checksum rustc-ap-arena 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b69fd4a0e8a3ecd99b497965d05f6f04dd2e4601a6146a841dbe4c8e77c2b30c"
>+-"checksum rustc-ap-graphviz 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8136418dbc491bab74aa0565eaa2086754a7a81a5e74a1d84d6168d18e889e7"
>+-"checksum rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a972feda82332d1d05b1ba5a097e915cd9c9c8f1af2bd7b08af09fb88c753d5f"
>+-"checksum rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "582584c6c48b0ece4b8aef3f9bb59d94d17c5665612bc87a71f509e45a3113b5"
>+-"checksum rustc-ap-rustc_errors 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd852096944d0ac6af1aefa9639a2ae6dede217606ce97f88ff0dcc8c86d6ff6"
>+-"checksum rustc-ap-rustc_target 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98301a272ecfeec29d2d4e97b07238707c2b89d86fc3a4a5f31a00728f14e288"
>+-"checksum rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f13510e617e2e322e3297038fd6a7346f2297124af9e10e33a627c5d544e9d"
>+-"checksum rustc-ap-syntax 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0792f5a9ccfc5ec13bb5b0472fa49e145481029c39f6bf5b1a36decc99c3328f"
>+-"checksum rustc-ap-syntax_pos 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0df9f97f41650d23b14f92f7267f8c61089655efb4533d82bf8991f99245198d"
>++"checksum rustc-ap-arena 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d24c8b3c1437fad023cb9472381216a1d41d82dbb2d2e6c7858bd6f50317719"
>++"checksum rustc-ap-rustc_cratesio_shim 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c5b02c76cd1ee4e9c97c8228701796d6b7431e8f100dea2d8af1d6c2c2bad56"
>++"checksum rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4076388154497fb9a007e3badd78e415402a5594111cd6bc7ce1420dd1b1818b"
>++"checksum rustc-ap-rustc_errors 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6c11e4789cbc276ceaa87d326c234b1a2d1e0fe6017b88a8a25903200060acb"
>++"checksum rustc-ap-rustc_target 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "25f711bb152b9d7cdd69410cfe6d99aeb1409c959e0fdf3c8ca4d220e568aa52"
>++"checksum rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57638db658d4942d3f30a12566836f9a67a636ed8002c8cae1c9231214e39929"
>++"checksum rustc-ap-syntax 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6dbcf07abf7a9957dce8d34353d55dfb4cd882153181f24349f4690facb58f0"
>++"checksum rustc-ap-syntax_pos 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0915cb5e166cabe588a129dec2d47357077e96fb1f9b57318fbe217eac4ce508"
>+ "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
>+ "checksum rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c6d5a683c6ba4ed37959097e88d71c9e8e26659a3cb5be8b389078e7ad45306"
>+ "checksum rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40f06724db71e18d68b3b946fdf890ca8c921d9edccc1404fdfdb537b0d12649"
>+@@ -835,7 +748,6 @@ dependencies = [
>+ "checksum syn 0.15.17 (registry+https://github.com/rust-lang/crates.io-index)" = "3391038ebc3e4ab24eb028cb0ef2f2dc4ba0cbf72ee895ed6a6fad730640b5bc"
>+ "checksum tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "47776f63b85777d984a50ce49d6b9e58826b6a3766a449fc95bc66cd5663c15b"
>+ "checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
>+-"checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f"
>+ "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
>+ "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
>+ "checksum thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "279ef31c19ededf577bfd12dfae728040a21f635b06a24cd670ff510edd38963"
>+@@ -848,7 +760,5 @@ dependencies = [
>+ "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
>+ "checksum winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "773ef9dcc5f24b7d850d0ff101e542ff24c3b090a9768e03ff889fdef41f00fd"
>+ "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
>+-"checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab"
>+ "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
>+ "checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
>+-"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba"
>+--- Cargo.toml.orig	2018-11-16 16:09:29 UTC
>++++ Cargo.toml
>+@@ -24,7 +24,7 @@ debug = true
>+ [dependencies]
>+ bitflags = "1.0"
>+ log = "0.4"
>+-rustc-ap-syntax = "297.0.0"
>++rustc-ap-syntax = "237.0.0"
>+ env_logger = "0.5"
>+ clap = "2.32"
>+ lazy_static = "1.0"

Actions: View | Diff

Attachments on bug 233282: 199304 | 199770