diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-27 10:50:08 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-27 10:50:08 +0100 |
commit | 18a6dd4635be18ebe73eb25ffa34a33f0ec8203f (patch) | |
tree | 38c2e2b9aaf1d721c8ab04b4f03ca29b27df4e85 /Cargo.lock | |
parent | dd3f9eaceb17f5686f6377250cbe510b348af318 (diff) | |
parent | 7e104ea4a885c8fd6f348a0d7d30911fe49d91e8 (diff) |
Merge #4982
4982: Bump chalk r=matklad a=lnicola
This passes the tests, but fails in a weird way on `analysis-stats`:
```
thread 'main' panicked at 'called `Option::unwrap()` on a `None` value', /home/me/.cargo/registry/src/github.com-1ecc6299db9ec823/chalk-solve-0.14.0/src/clauses/builtin_traits/fn_family.rs:96:20
stack backtrace:
0: backtrace::backtrace::libunwind::trace
at /cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.46/src/backtrace/libunwind.rs:86
1: backtrace::backtrace::trace_unsynchronized
at /cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.46/src/backtrace/mod.rs:66
2: std::sys_common::backtrace::_print_fmt
at src/libstd/sys_common/backtrace.rs:78
3: <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt
at src/libstd/sys_common/backtrace.rs:59
4: core::fmt::write
at src/libcore/fmt/mod.rs:1076
5: std::io::Write::write_fmt
at src/libstd/io/mod.rs:1537
6: std::sys_common::backtrace::_print
at src/libstd/sys_common/backtrace.rs:62
7: std::sys_common::backtrace::print
at src/libstd/sys_common/backtrace.rs:49
8: std::panicking::default_hook::{{closure}}
at src/libstd/panicking.rs:198
9: std::panicking::default_hook
at src/libstd/panicking.rs:218
10: std::panicking::rust_panic_with_hook
at src/libstd/panicking.rs:477
11: rust_begin_unwind
at src/libstd/panicking.rs:385
12: core::panicking::panic_fmt
at src/libcore/panicking.rs:86
13: core::panicking::panic
at src/libcore/panicking.rs:51
14: chalk_solve::clauses::builtin_traits::fn_family::add_fn_trait_program_clauses
15: chalk_solve::clauses::builder::ClauseBuilder<I>::push_binders
16: chalk_solve::clauses::program_clauses_that_could_match
17: chalk_solve::clauses::program_clauses_for_goal
18: chalk_solve::recursive::Solver<I>::solve_new_subgoal
19: <chalk_solve::recursive::Solver<I> as chalk_solve::recursive::solve::SolveDatabase<I>>::solve_goal
20: chalk_solve::recursive::Solver<I>::solve_root_goal
21: chalk_solve::solve::Solver<I>::solve_limited
22: ra_hir_ty::traits::trait_solve_query
23: salsa::runtime::Runtime<DB>::execute_query_implementation
24: salsa::derived::slot::Slot<DB,Q,MP>::read_upgrade
25: salsa::derived::slot::Slot<DB,Q,MP>::read
26: <salsa::derived::DerivedStorage<DB,Q,MP> as salsa::plumbing::QueryStorageOps<DB,Q>>::try_fetch
27: salsa::QueryTable<DB,Q>::get
28: <T as ra_hir_ty::db::HirDatabase>::trait_solve
29: ra_hir_ty::infer::InferenceContext::resolve_ty_as_possible
30: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_inner
31: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_coerce
32: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::check_call_arguments
33: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_method_call
34: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_inner
35: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr
36: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_method_call
37: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_inner
38: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_coerce
39: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_inner
40: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_inner
41: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_coerce
42: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_inner
43: ra_hir_ty::infer::expr::<impl ra_hir_ty::infer::InferenceContext>::infer_expr_coerce
44: ra_hir_ty::infer::infer_query
45: salsa::runtime::Runtime<DB>::execute_query_implementation
46: salsa::derived::slot::Slot<DB,Q,MP>::read_upgrade
47: salsa::derived::slot::Slot<DB,Q,MP>::read
48: <salsa::derived::DerivedStorage<DB,Q,MP> as salsa::plumbing::QueryStorageOps<DB,Q>>::try_fetch
49: ra_hir_ty::db::infer_wait
50: rust_analyzer::cli::analysis_stats::analysis_stats
51: rust_analyzer::main
52: std::rt::lang_start::{{closure}}
53: std::rt::lang_start_internal::{{closure}}
at src/libstd/rt.rs:52
54: std::panicking::try::do_call
at src/libstd/panicking.rs:297
55: std::panicking::try
at src/libstd/panicking.rs:274
56: std::panic::catch_unwind
at src/libstd/panic.rs:394
57: std::rt::lang_start_internal
at src/libstd/rt.rs:51
58: main
59: __libc_start_main
60: _start
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
```
It's as if we're returning `None` for a well-known trait that `chalk` asks about. That seems to happen for `Deref`, `CoerceUnsized` and `Try`.
r? @flodiebold
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 190 |
1 files changed, 172 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock index 044314a8f..fe71b9971 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -25,6 +25,15 @@ dependencies = [ | |||
25 | ] | 25 | ] |
26 | 26 | ||
27 | [[package]] | 27 | [[package]] |
28 | name = "ansi_term" | ||
29 | version = "0.11.0" | ||
30 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
31 | checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" | ||
32 | dependencies = [ | ||
33 | "winapi 0.3.8", | ||
34 | ] | ||
35 | |||
36 | [[package]] | ||
28 | name = "anyhow" | 37 | name = "anyhow" |
29 | version = "1.0.31" | 38 | version = "1.0.31" |
30 | source = "registry+https://github.com/rust-lang/crates.io-index" | 39 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -95,6 +104,12 @@ dependencies = [ | |||
95 | ] | 104 | ] |
96 | 105 | ||
97 | [[package]] | 106 | [[package]] |
107 | name = "byteorder" | ||
108 | version = "1.3.4" | ||
109 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
110 | checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" | ||
111 | |||
112 | [[package]] | ||
98 | name = "cargo_metadata" | 113 | name = "cargo_metadata" |
99 | version = "0.10.0" | 114 | version = "0.10.0" |
100 | source = "registry+https://github.com/rust-lang/crates.io-index" | 115 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -120,9 +135,8 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | |||
120 | 135 | ||
121 | [[package]] | 136 | [[package]] |
122 | name = "chalk-derive" | 137 | name = "chalk-derive" |
123 | version = "0.11.0" | 138 | version = "0.15.0-dev.0" |
124 | source = "registry+https://github.com/rust-lang/crates.io-index" | 139 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" |
125 | checksum = "5b9bd01eab87277d973183a1d2e56bace1c11f8242c52c20636fb7dddf343ac9" | ||
126 | dependencies = [ | 140 | dependencies = [ |
127 | "proc-macro2", | 141 | "proc-macro2", |
128 | "quote", | 142 | "quote", |
@@ -132,20 +146,19 @@ dependencies = [ | |||
132 | 146 | ||
133 | [[package]] | 147 | [[package]] |
134 | name = "chalk-engine" | 148 | name = "chalk-engine" |
135 | version = "0.11.0" | 149 | version = "0.15.0-dev.0" |
136 | source = "registry+https://github.com/rust-lang/crates.io-index" | 150 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" |
137 | checksum = "6c7a637c3d17ed555aef16e16952a5d1e127bd55178cc30be22afeb92da90c7d" | ||
138 | dependencies = [ | 151 | dependencies = [ |
139 | "chalk-derive", | 152 | "chalk-derive", |
140 | "chalk-ir", | 153 | "chalk-ir", |
141 | "rustc-hash", | 154 | "rustc-hash", |
155 | "tracing", | ||
142 | ] | 156 | ] |
143 | 157 | ||
144 | [[package]] | 158 | [[package]] |
145 | name = "chalk-ir" | 159 | name = "chalk-ir" |
146 | version = "0.11.0" | 160 | version = "0.15.0-dev.0" |
147 | source = "registry+https://github.com/rust-lang/crates.io-index" | 161 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" |
148 | checksum = "595e5735ded16c3f3dc348f7b15bbb2521a0080b1863cac38ad5271589944670" | ||
149 | dependencies = [ | 162 | dependencies = [ |
150 | "chalk-derive", | 163 | "chalk-derive", |
151 | "lazy_static", | 164 | "lazy_static", |
@@ -153,9 +166,8 @@ dependencies = [ | |||
153 | 166 | ||
154 | [[package]] | 167 | [[package]] |
155 | name = "chalk-solve" | 168 | name = "chalk-solve" |
156 | version = "0.11.0" | 169 | version = "0.15.0-dev.0" |
157 | source = "registry+https://github.com/rust-lang/crates.io-index" | 170 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" |
158 | checksum = "5d9d938139db425867a30cc0cfec0269406d8238d0571d829041eaa7a8455d11" | ||
159 | dependencies = [ | 171 | dependencies = [ |
160 | "chalk-derive", | 172 | "chalk-derive", |
161 | "chalk-engine", | 173 | "chalk-engine", |
@@ -164,6 +176,19 @@ dependencies = [ | |||
164 | "itertools", | 176 | "itertools", |
165 | "petgraph", | 177 | "petgraph", |
166 | "rustc-hash", | 178 | "rustc-hash", |
179 | "tracing", | ||
180 | "tracing-subscriber", | ||
181 | ] | ||
182 | |||
183 | [[package]] | ||
184 | name = "chrono" | ||
185 | version = "0.4.11" | ||
186 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
187 | checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" | ||
188 | dependencies = [ | ||
189 | "num-integer", | ||
190 | "num-traits", | ||
191 | "time", | ||
167 | ] | 192 | ] |
168 | 193 | ||
169 | [[package]] | 194 | [[package]] |
@@ -677,6 +702,15 @@ dependencies = [ | |||
677 | ] | 702 | ] |
678 | 703 | ||
679 | [[package]] | 704 | [[package]] |
705 | name = "matchers" | ||
706 | version = "0.0.1" | ||
707 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
708 | checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" | ||
709 | dependencies = [ | ||
710 | "regex-automata", | ||
711 | ] | ||
712 | |||
713 | [[package]] | ||
680 | name = "matches" | 714 | name = "matches" |
681 | version = "0.1.8" | 715 | version = "0.1.8" |
682 | source = "registry+https://github.com/rust-lang/crates.io-index" | 716 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -797,6 +831,25 @@ dependencies = [ | |||
797 | ] | 831 | ] |
798 | 832 | ||
799 | [[package]] | 833 | [[package]] |
834 | name = "num-integer" | ||
835 | version = "0.1.43" | ||
836 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
837 | checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" | ||
838 | dependencies = [ | ||
839 | "autocfg", | ||
840 | "num-traits", | ||
841 | ] | ||
842 | |||
843 | [[package]] | ||
844 | name = "num-traits" | ||
845 | version = "0.2.12" | ||
846 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
847 | checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" | ||
848 | dependencies = [ | ||
849 | "autocfg", | ||
850 | ] | ||
851 | |||
852 | [[package]] | ||
800 | name = "num_cpus" | 853 | name = "num_cpus" |
801 | version = "1.13.0" | 854 | version = "1.13.0" |
802 | source = "registry+https://github.com/rust-lang/crates.io-index" | 855 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1334,6 +1387,16 @@ dependencies = [ | |||
1334 | ] | 1387 | ] |
1335 | 1388 | ||
1336 | [[package]] | 1389 | [[package]] |
1390 | name = "regex-automata" | ||
1391 | version = "0.1.9" | ||
1392 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1393 | checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" | ||
1394 | dependencies = [ | ||
1395 | "byteorder", | ||
1396 | "regex-syntax", | ||
1397 | ] | ||
1398 | |||
1399 | [[package]] | ||
1337 | name = "regex-syntax" | 1400 | name = "regex-syntax" |
1338 | version = "0.6.18" | 1401 | version = "0.6.18" |
1339 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1402 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1524,18 +1587,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" | |||
1524 | 1587 | ||
1525 | [[package]] | 1588 | [[package]] |
1526 | name = "serde" | 1589 | name = "serde" |
1527 | version = "1.0.113" | 1590 | version = "1.0.114" |
1528 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1591 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1529 | checksum = "6135c78461981c79497158ef777264c51d9d0f4f3fc3a4d22b915900e42dac6a" | 1592 | checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" |
1530 | dependencies = [ | 1593 | dependencies = [ |
1531 | "serde_derive", | 1594 | "serde_derive", |
1532 | ] | 1595 | ] |
1533 | 1596 | ||
1534 | [[package]] | 1597 | [[package]] |
1535 | name = "serde_derive" | 1598 | name = "serde_derive" |
1536 | version = "1.0.113" | 1599 | version = "1.0.114" |
1537 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1600 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1538 | checksum = "93c5eaa17d0954cb481cdcfffe9d84fcfa7a1a9f2349271e678677be4c26ae31" | 1601 | checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" |
1539 | dependencies = [ | 1602 | dependencies = [ |
1540 | "proc-macro2", | 1603 | "proc-macro2", |
1541 | "quote", | 1604 | "quote", |
@@ -1577,6 +1640,15 @@ dependencies = [ | |||
1577 | ] | 1640 | ] |
1578 | 1641 | ||
1579 | [[package]] | 1642 | [[package]] |
1643 | name = "sharded-slab" | ||
1644 | version = "0.0.9" | ||
1645 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1646 | checksum = "06d5a3f5166fb5b42a5439f2eee8b9de149e235961e3eb21c5808fc3ea17ff3e" | ||
1647 | dependencies = [ | ||
1648 | "lazy_static", | ||
1649 | ] | ||
1650 | |||
1651 | [[package]] | ||
1580 | name = "slab" | 1652 | name = "slab" |
1581 | version = "0.4.2" | 1653 | version = "0.4.2" |
1582 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1654 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1609,9 +1681,9 @@ checksum = "ab16ced94dbd8a46c82fd81e3ed9a8727dac2977ea869d217bcc4ea1f122e81f" | |||
1609 | 1681 | ||
1610 | [[package]] | 1682 | [[package]] |
1611 | name = "syn" | 1683 | name = "syn" |
1612 | version = "1.0.32" | 1684 | version = "1.0.33" |
1613 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1685 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1614 | checksum = "a994520748611c17d163e81b6c4a4b13d11b7f63884362ab2efac3aa9cf16d00" | 1686 | checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" |
1615 | dependencies = [ | 1687 | dependencies = [ |
1616 | "proc-macro2", | 1688 | "proc-macro2", |
1617 | "quote", | 1689 | "quote", |
@@ -1705,12 +1777,94 @@ dependencies = [ | |||
1705 | ] | 1777 | ] |
1706 | 1778 | ||
1707 | [[package]] | 1779 | [[package]] |
1780 | name = "time" | ||
1781 | version = "0.1.43" | ||
1782 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1783 | checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" | ||
1784 | dependencies = [ | ||
1785 | "libc", | ||
1786 | "winapi 0.3.8", | ||
1787 | ] | ||
1788 | |||
1789 | [[package]] | ||
1708 | name = "tinyvec" | 1790 | name = "tinyvec" |
1709 | version = "0.3.3" | 1791 | version = "0.3.3" |
1710 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1792 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1711 | checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" | 1793 | checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" |
1712 | 1794 | ||
1713 | [[package]] | 1795 | [[package]] |
1796 | name = "tracing" | ||
1797 | version = "0.1.15" | ||
1798 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1799 | checksum = "a41f40ed0e162c911ac6fcb53ecdc8134c46905fdbbae8c50add462a538b495f" | ||
1800 | dependencies = [ | ||
1801 | "cfg-if", | ||
1802 | "tracing-attributes", | ||
1803 | "tracing-core", | ||
1804 | ] | ||
1805 | |||
1806 | [[package]] | ||
1807 | name = "tracing-attributes" | ||
1808 | version = "0.1.8" | ||
1809 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1810 | checksum = "99bbad0de3fd923c9c3232ead88510b783e5a4d16a6154adffa3d53308de984c" | ||
1811 | dependencies = [ | ||
1812 | "proc-macro2", | ||
1813 | "quote", | ||
1814 | "syn", | ||
1815 | ] | ||
1816 | |||
1817 | [[package]] | ||
1818 | name = "tracing-core" | ||
1819 | version = "0.1.10" | ||
1820 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1821 | checksum = "0aa83a9a47081cd522c09c81b31aec2c9273424976f922ad61c053b58350b715" | ||
1822 | dependencies = [ | ||
1823 | "lazy_static", | ||
1824 | ] | ||
1825 | |||
1826 | [[package]] | ||
1827 | name = "tracing-log" | ||
1828 | version = "0.1.1" | ||
1829 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1830 | checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" | ||
1831 | dependencies = [ | ||
1832 | "lazy_static", | ||
1833 | "log", | ||
1834 | "tracing-core", | ||
1835 | ] | ||
1836 | |||
1837 | [[package]] | ||
1838 | name = "tracing-serde" | ||
1839 | version = "0.1.1" | ||
1840 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1841 | checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79" | ||
1842 | dependencies = [ | ||
1843 | "serde", | ||
1844 | "tracing-core", | ||
1845 | ] | ||
1846 | |||
1847 | [[package]] | ||
1848 | name = "tracing-subscriber" | ||
1849 | version = "0.2.6" | ||
1850 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1851 | checksum = "04a11b459109e38ff6e1b580bafef4142a11d44889f5d07424cbce2fd2a2a119" | ||
1852 | dependencies = [ | ||
1853 | "ansi_term", | ||
1854 | "chrono", | ||
1855 | "lazy_static", | ||
1856 | "matchers", | ||
1857 | "regex", | ||
1858 | "serde", | ||
1859 | "serde_json", | ||
1860 | "sharded-slab", | ||
1861 | "smallvec", | ||
1862 | "tracing-core", | ||
1863 | "tracing-log", | ||
1864 | "tracing-serde", | ||
1865 | ] | ||
1866 | |||
1867 | [[package]] | ||
1714 | name = "unicode-bidi" | 1868 | name = "unicode-bidi" |
1715 | version = "0.3.4" | 1869 | version = "0.3.4" |
1716 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1870 | source = "registry+https://github.com/rust-lang/crates.io-index" |