diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-14 18:41:52 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-14 18:41:52 +0100 |
commit | efddf9e7db2d41b602d3d08527f20f466381bcdb (patch) | |
tree | e8ecb9ed25dddd86d69a0f75b2fdb8b3e3da22e8 | |
parent | 38ae18b7592f97a7058d97928307bccbd881a582 (diff) | |
parent | 06f5d6f6404cf134d1d8b39a4aea9f7c7342af52 (diff) |
Merge #9273
9273: internal: don't pull tracing via chalk r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | Cargo.lock | 50 | ||||
-rw-r--r-- | crates/hir_ty/Cargo.toml | 2 |
2 files changed, 1 insertions, 51 deletions
diff --git a/Cargo.lock b/Cargo.lock index 847277118..5066d5f0f 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -216,20 +216,6 @@ dependencies = [ | |||
216 | "petgraph", | 216 | "petgraph", |
217 | "rustc-hash", | 217 | "rustc-hash", |
218 | "tracing", | 218 | "tracing", |
219 | "tracing-subscriber", | ||
220 | "tracing-tree", | ||
221 | ] | ||
222 | |||
223 | [[package]] | ||
224 | name = "chrono" | ||
225 | version = "0.4.19" | ||
226 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
227 | checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" | ||
228 | dependencies = [ | ||
229 | "libc", | ||
230 | "num-integer", | ||
231 | "num-traits", | ||
232 | "winapi", | ||
233 | ] | 219 | ] |
234 | 220 | ||
235 | [[package]] | 221 | [[package]] |
@@ -975,25 +961,6 @@ dependencies = [ | |||
975 | ] | 961 | ] |
976 | 962 | ||
977 | [[package]] | 963 | [[package]] |
978 | name = "num-integer" | ||
979 | version = "0.1.44" | ||
980 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
981 | checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" | ||
982 | dependencies = [ | ||
983 | "autocfg", | ||
984 | "num-traits", | ||
985 | ] | ||
986 | |||
987 | [[package]] | ||
988 | name = "num-traits" | ||
989 | version = "0.2.14" | ||
990 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
991 | checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" | ||
992 | dependencies = [ | ||
993 | "autocfg", | ||
994 | ] | ||
995 | |||
996 | [[package]] | ||
997 | name = "num_cpus" | 964 | name = "num_cpus" |
998 | version = "1.13.0" | 965 | version = "1.13.0" |
999 | source = "registry+https://github.com/rust-lang/crates.io-index" | 966 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1762,35 +1729,18 @@ dependencies = [ | |||
1762 | ] | 1729 | ] |
1763 | 1730 | ||
1764 | [[package]] | 1731 | [[package]] |
1765 | name = "tracing-serde" | ||
1766 | version = "0.1.2" | ||
1767 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1768 | checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" | ||
1769 | dependencies = [ | ||
1770 | "serde", | ||
1771 | "tracing-core", | ||
1772 | ] | ||
1773 | |||
1774 | [[package]] | ||
1775 | name = "tracing-subscriber" | 1732 | name = "tracing-subscriber" |
1776 | version = "0.2.18" | 1733 | version = "0.2.18" |
1777 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1734 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1778 | checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" | 1735 | checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5" |
1779 | dependencies = [ | 1736 | dependencies = [ |
1780 | "ansi_term", | ||
1781 | "chrono", | ||
1782 | "lazy_static", | 1737 | "lazy_static", |
1783 | "matchers", | 1738 | "matchers", |
1784 | "regex", | 1739 | "regex", |
1785 | "serde", | ||
1786 | "serde_json", | ||
1787 | "sharded-slab", | 1740 | "sharded-slab", |
1788 | "smallvec", | ||
1789 | "thread_local", | 1741 | "thread_local", |
1790 | "tracing", | 1742 | "tracing", |
1791 | "tracing-core", | 1743 | "tracing-core", |
1792 | "tracing-log", | ||
1793 | "tracing-serde", | ||
1794 | ] | 1744 | ] |
1795 | 1745 | ||
1796 | [[package]] | 1746 | [[package]] |
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index a1894e8d8..74129eb21 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml | |||
@@ -20,7 +20,7 @@ rustc-hash = "1.1.0" | |||
20 | scoped-tls = "1" | 20 | scoped-tls = "1" |
21 | chalk-solve = { version = "0.68", default-features = false } | 21 | chalk-solve = { version = "0.68", default-features = false } |
22 | chalk-ir = "0.68" | 22 | chalk-ir = "0.68" |
23 | chalk-recursive = "0.68" | 23 | chalk-recursive = { version = "0.68", default-features = false } |
24 | la-arena = { version = "0.2.0", path = "../../lib/arena" } | 24 | la-arena = { version = "0.2.0", path = "../../lib/arena" } |
25 | once_cell = { version = "1.5.0" } | 25 | once_cell = { version = "1.5.0" } |
26 | 26 | ||