aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-01-18 18:24:47 +0000
committerGitHub <[email protected]>2021-01-18 18:24:47 +0000
commit6764d790ac904533dc7618fd38724a135499f87c (patch)
treed8f7bfd9c8d53a8338694296c83f199cf5a92a72
parenta1c72451bb8b657f4e5a015428112090402de106 (diff)
parenta8b984185b6a396aaace405189aa48b8c4a4cd7e (diff)
Merge #7333
7333: cargo update r=kjeremy a=kjeremy Update test_serialize_proc_macro for new serde version. I'm assuming the test update is legitimate but I would like someone to double check since I'm not familiar with this area. Co-authored-by: kjeremy <[email protected]>
-rw-r--r--Cargo.lock68
-rw-r--r--crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt8
2 files changed, 38 insertions, 38 deletions
diff --git a/Cargo.lock b/Cargo.lock
index aac473191..b6b6f0341 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -26,9 +26,9 @@ dependencies = [
26 26
27[[package]] 27[[package]]
28name = "anyhow" 28name = "anyhow"
29version = "1.0.37" 29version = "1.0.38"
30source = "registry+https://github.com/rust-lang/crates.io-index" 30source = "registry+https://github.com/rust-lang/crates.io-index"
31checksum = "ee67c11feeac938fae061b232e38e0b6d94f97a9df10e6271319325ac4c56a86" 31checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
32 32
33[[package]] 33[[package]]
34name = "anymap" 34name = "anymap"
@@ -118,9 +118,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
118 118
119[[package]] 119[[package]]
120name = "byteorder" 120name = "byteorder"
121version = "1.3.4" 121version = "1.4.2"
122source = "registry+https://github.com/rust-lang/crates.io-index" 122source = "registry+https://github.com/rust-lang/crates.io-index"
123checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" 123checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
124 124
125[[package]] 125[[package]]
126name = "cargo-platform" 126name = "cargo-platform"
@@ -133,9 +133,9 @@ dependencies = [
133 133
134[[package]] 134[[package]]
135name = "cargo_metadata" 135name = "cargo_metadata"
136version = "0.12.2" 136version = "0.12.3"
137source = "registry+https://github.com/rust-lang/crates.io-index" 137source = "registry+https://github.com/rust-lang/crates.io-index"
138checksum = "11a47b6286279a9998588ef7050d1ebc2500c69892a557c90fe5d071c64415dc" 138checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
139dependencies = [ 139dependencies = [
140 "cargo-platform", 140 "cargo-platform",
141 "semver", 141 "semver",
@@ -269,9 +269,9 @@ dependencies = [
269 269
270[[package]] 270[[package]]
271name = "const_fn" 271name = "const_fn"
272version = "0.4.4" 272version = "0.4.5"
273source = "registry+https://github.com/rust-lang/crates.io-index" 273source = "registry+https://github.com/rust-lang/crates.io-index"
274checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" 274checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
275 275
276[[package]] 276[[package]]
277name = "crc32fast" 277name = "crc32fast"
@@ -518,9 +518,9 @@ dependencies = [
518 518
519[[package]] 519[[package]]
520name = "hermit-abi" 520name = "hermit-abi"
521version = "0.1.17" 521version = "0.1.18"
522source = "registry+https://github.com/rust-lang/crates.io-index" 522source = "registry+https://github.com/rust-lang/crates.io-index"
523checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" 523checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
524dependencies = [ 524dependencies = [
525 "libc", 525 "libc",
526] 526]
@@ -708,9 +708,9 @@ dependencies = [
708 708
709[[package]] 709[[package]]
710name = "inotify-sys" 710name = "inotify-sys"
711version = "0.1.4" 711version = "0.1.5"
712source = "registry+https://github.com/rust-lang/crates.io-index" 712source = "registry+https://github.com/rust-lang/crates.io-index"
713checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55" 713checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
714dependencies = [ 714dependencies = [
715 "libc", 715 "libc",
716] 716]
@@ -791,15 +791,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
791 791
792[[package]] 792[[package]]
793name = "libc" 793name = "libc"
794version = "0.2.81" 794version = "0.2.82"
795source = "registry+https://github.com/rust-lang/crates.io-index" 795source = "registry+https://github.com/rust-lang/crates.io-index"
796checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" 796checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
797 797
798[[package]] 798[[package]]
799name = "libloading" 799name = "libloading"
800version = "0.6.6" 800version = "0.6.7"
801source = "registry+https://github.com/rust-lang/crates.io-index" 801source = "registry+https://github.com/rust-lang/crates.io-index"
802checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc" 802checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
803dependencies = [ 803dependencies = [
804 "cfg-if 1.0.0", 804 "cfg-if 1.0.0",
805 "winapi 0.3.9", 805 "winapi 0.3.9",
@@ -825,9 +825,9 @@ dependencies = [
825 825
826[[package]] 826[[package]]
827name = "log" 827name = "log"
828version = "0.4.11" 828version = "0.4.13"
829source = "registry+https://github.com/rust-lang/crates.io-index" 829source = "registry+https://github.com/rust-lang/crates.io-index"
830checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" 830checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2"
831dependencies = [ 831dependencies = [
832 "cfg-if 0.1.10", 832 "cfg-if 0.1.10",
833] 833]
@@ -1160,9 +1160,9 @@ checksum = "28b9b4df73455c861d7cbf8be42f01d3b373ed7f02e378d55fa84eafc6f638b1"
1160 1160
1161[[package]] 1161[[package]]
1162name = "pin-project-lite" 1162name = "pin-project-lite"
1163version = "0.2.0" 1163version = "0.2.4"
1164source = "registry+https://github.com/rust-lang/crates.io-index" 1164source = "registry+https://github.com/rust-lang/crates.io-index"
1165checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" 1165checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
1166 1166
1167[[package]] 1167[[package]]
1168name = "proc-macro2" 1168name = "proc-macro2"
@@ -1301,9 +1301,9 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
1301 1301
1302[[package]] 1302[[package]]
1303name = "regex" 1303name = "regex"
1304version = "1.4.2" 1304version = "1.4.3"
1305source = "registry+https://github.com/rust-lang/crates.io-index" 1305source = "registry+https://github.com/rust-lang/crates.io-index"
1306checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" 1306checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
1307dependencies = [ 1307dependencies = [
1308 "regex-syntax", 1308 "regex-syntax",
1309] 1309]
@@ -1320,9 +1320,9 @@ dependencies = [
1320 1320
1321[[package]] 1321[[package]]
1322name = "regex-syntax" 1322name = "regex-syntax"
1323version = "0.6.21" 1323version = "0.6.22"
1324source = "registry+https://github.com/rust-lang/crates.io-index" 1324source = "registry+https://github.com/rust-lang/crates.io-index"
1325checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" 1325checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
1326 1326
1327[[package]] 1327[[package]]
1328name = "rowan" 1328name = "rowan"
@@ -1485,18 +1485,18 @@ dependencies = [
1485 1485
1486[[package]] 1486[[package]]
1487name = "serde" 1487name = "serde"
1488version = "1.0.118" 1488version = "1.0.119"
1489source = "registry+https://github.com/rust-lang/crates.io-index" 1489source = "registry+https://github.com/rust-lang/crates.io-index"
1490checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" 1490checksum = "9bdd36f49e35b61d49efd8aa7fc068fd295961fd2286d0b2ee9a4c7a14e99cc3"
1491dependencies = [ 1491dependencies = [
1492 "serde_derive", 1492 "serde_derive",
1493] 1493]
1494 1494
1495[[package]] 1495[[package]]
1496name = "serde_derive" 1496name = "serde_derive"
1497version = "1.0.118" 1497version = "1.0.119"
1498source = "registry+https://github.com/rust-lang/crates.io-index" 1498source = "registry+https://github.com/rust-lang/crates.io-index"
1499checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" 1499checksum = "552954ce79a059ddd5fd68c271592374bd15cab2274970380c000118aeffe1cd"
1500dependencies = [ 1500dependencies = [
1501 "proc-macro2", 1501 "proc-macro2",
1502 "quote", 1502 "quote",
@@ -1552,9 +1552,9 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
1552 1552
1553[[package]] 1553[[package]]
1554name = "smallvec" 1554name = "smallvec"
1555version = "1.6.0" 1555version = "1.6.1"
1556source = "registry+https://github.com/rust-lang/crates.io-index" 1556source = "registry+https://github.com/rust-lang/crates.io-index"
1557checksum = "1a55ca5f3b68e41c979bf8c46a6f1da892ca4db8f94023ce0bd32407573b1ac0" 1557checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
1558 1558
1559[[package]] 1559[[package]]
1560name = "smol_str" 1560name = "smol_str"
@@ -1594,9 +1594,9 @@ dependencies = [
1594 1594
1595[[package]] 1595[[package]]
1596name = "syn" 1596name = "syn"
1597version = "1.0.57" 1597version = "1.0.58"
1598source = "registry+https://github.com/rust-lang/crates.io-index" 1598source = "registry+https://github.com/rust-lang/crates.io-index"
1599checksum = "4211ce9909eb971f111059df92c45640aad50a619cf55cd76476be803c4c68e6" 1599checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5"
1600dependencies = [ 1600dependencies = [
1601 "proc-macro2", 1601 "proc-macro2",
1602 "quote", 1602 "quote",
@@ -1673,9 +1673,9 @@ dependencies = [
1673 1673
1674[[package]] 1674[[package]]
1675name = "thread_local" 1675name = "thread_local"
1676version = "1.0.1" 1676version = "1.1.0"
1677source = "registry+https://github.com/rust-lang/crates.io-index" 1677source = "registry+https://github.com/rust-lang/crates.io-index"
1678checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" 1678checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
1679dependencies = [ 1679dependencies = [
1680 "lazy_static", 1680 "lazy_static",
1681] 1681]
diff --git a/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
index e6fd21610..ea34e688f 100644
--- a/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
+++ b/crates/proc_macro_srv/src/tests/fixtures/test_serialize_proc_macro.txt
@@ -59,7 +59,7 @@ SUBTREE $
59 IDENT _serde 4294967295 59 IDENT _serde 4294967295
60 PUNCH : [joint] 4294967295 60 PUNCH : [joint] 4294967295
61 PUNCH : [alone] 4294967295 61 PUNCH : [alone] 4294967295
62 IDENT export 4294967295 62 IDENT __private 4294967295
63 PUNCH : [joint] 4294967295 63 PUNCH : [joint] 4294967295
64 PUNCH : [alone] 4294967295 64 PUNCH : [alone] 4294967295
65 IDENT Ok 4294967295 65 IDENT Ok 4294967295
@@ -72,7 +72,7 @@ SUBTREE $
72 IDENT _serde 4294967295 72 IDENT _serde 4294967295
73 PUNCH : [joint] 4294967295 73 PUNCH : [joint] 4294967295
74 PUNCH : [alone] 4294967295 74 PUNCH : [alone] 4294967295
75 IDENT export 4294967295 75 IDENT __private 4294967295
76 PUNCH : [joint] 4294967295 76 PUNCH : [joint] 4294967295
77 PUNCH : [alone] 4294967295 77 PUNCH : [alone] 4294967295
78 IDENT Err 4294967295 78 IDENT Err 4294967295
@@ -85,7 +85,7 @@ SUBTREE $
85 IDENT _serde 4294967295 85 IDENT _serde 4294967295
86 PUNCH : [joint] 4294967295 86 PUNCH : [joint] 4294967295
87 PUNCH : [alone] 4294967295 87 PUNCH : [alone] 4294967295
88 IDENT export 4294967295 88 IDENT __private 4294967295
89 PUNCH : [joint] 4294967295 89 PUNCH : [joint] 4294967295
90 PUNCH : [alone] 4294967295 90 PUNCH : [alone] 4294967295
91 IDENT Err 4294967295 91 IDENT Err 4294967295
@@ -120,7 +120,7 @@ SUBTREE $
120 IDENT _serde 4294967295 120 IDENT _serde 4294967295
121 PUNCH : [joint] 4294967295 121 PUNCH : [joint] 4294967295
122 PUNCH : [alone] 4294967295 122 PUNCH : [alone] 4294967295
123 IDENT export 4294967295 123 IDENT __private 4294967295
124 PUNCH : [joint] 4294967295 124 PUNCH : [joint] 4294967295
125 PUNCH : [alone] 4294967295 125 PUNCH : [alone] 4294967295
126 IDENT Result 4294967295 126 IDENT Result 4294967295