diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-30 19:19:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-30 19:19:28 +0000 |
| commit | 780f476b4f438d473bc2e2299c2b8bf0a6fb9257 (patch) | |
| tree | de3a3eceb92c9604bc14c12885ce887186c39dd3 | |
| parent | 9712889ee4c6cffa37c2ace5da9b00bf29adab56 (diff) | |
| parent | 3fe539ce51f417605a6da6bc3c6d135053b1ee67 (diff) | |
Merge #2451
2451: Use env_logger instead of flexi_logger r=matklad a=AlexanderEkdahl
This fixes https://github.com/rust-analyzer/rust-analyzer/issues/2335
- By default only `error` will be printed. From what I can tell this matches the current behaviour. Configured through `RUST_LOG`.
- I looked through the optional dependencies for `env_logger`and I have only enabled `human_time`. Without this feature no timestamp will be shown for log messages.
- `RA_LOG_DIR` feature is removed
This PR adds 2 new dependencies(`env_logger` and `human_time`) and removes 6 dependencies.
Co-authored-by: Alexander Ekdahl <alexander@ekdahl.io>
| -rw-r--r-- | Cargo.lock | 80 | ||||
| -rw-r--r-- | crates/ra_cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/ra_cli/src/main.rs | 3 | ||||
| -rw-r--r-- | crates/ra_lsp_server/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/ra_lsp_server/src/main.rs | 7 | ||||
| -rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/main.rs | 1 | ||||
| -rw-r--r-- | crates/ra_lsp_server/tests/heavy_tests/support.rs | 3 | ||||
| -rw-r--r-- | docs/dev/README.md | 5 |
8 files changed, 28 insertions, 75 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2557b5e59..83e41940b 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
| @@ -187,16 +187,6 @@ dependencies = [ | |||
| 187 | ] | 187 | ] |
| 188 | 188 | ||
| 189 | [[package]] | 189 | [[package]] |
| 190 | name = "chrono" | ||
| 191 | version = "0.4.10" | ||
| 192 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 193 | dependencies = [ | ||
| 194 | "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 195 | "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 196 | "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 197 | ] | ||
| 198 | |||
| 199 | [[package]] | ||
| 200 | name = "clicolors-control" | 190 | name = "clicolors-control" |
| 201 | version = "1.0.1" | 191 | version = "1.0.1" |
| 202 | source = "registry+https://github.com/rust-lang/crates.io-index" | 192 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -324,6 +314,15 @@ version = "0.3.6" | |||
| 324 | source = "registry+https://github.com/rust-lang/crates.io-index" | 314 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 325 | 315 | ||
| 326 | [[package]] | 316 | [[package]] |
| 317 | name = "env_logger" | ||
| 318 | version = "0.7.1" | ||
| 319 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 320 | dependencies = [ | ||
| 321 | "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 322 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 323 | ] | ||
| 324 | |||
| 325 | [[package]] | ||
| 327 | name = "filetime" | 326 | name = "filetime" |
| 328 | version = "0.2.8" | 327 | version = "0.2.8" |
| 329 | source = "registry+https://github.com/rust-lang/crates.io-index" | 328 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -340,18 +339,6 @@ version = "0.1.9" | |||
| 340 | source = "registry+https://github.com/rust-lang/crates.io-index" | 339 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 341 | 340 | ||
| 342 | [[package]] | 341 | [[package]] |
| 343 | name = "flexi_logger" | ||
| 344 | version = "0.14.5" | ||
| 345 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 346 | dependencies = [ | ||
| 347 | "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 348 | "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 349 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 350 | "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 351 | "yansi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 352 | ] | ||
| 353 | |||
| 354 | [[package]] | ||
| 355 | name = "fnv" | 342 | name = "fnv" |
| 356 | version = "1.0.6" | 343 | version = "1.0.6" |
| 357 | source = "registry+https://github.com/rust-lang/crates.io-index" | 344 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -421,11 +408,6 @@ dependencies = [ | |||
| 421 | ] | 408 | ] |
| 422 | 409 | ||
| 423 | [[package]] | 410 | [[package]] |
| 424 | name = "glob" | ||
| 425 | version = "0.3.0" | ||
| 426 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 427 | |||
| 428 | [[package]] | ||
| 429 | name = "globset" | 411 | name = "globset" |
| 430 | version = "0.4.4" | 412 | version = "0.4.4" |
| 431 | source = "registry+https://github.com/rust-lang/crates.io-index" | 413 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -454,6 +436,14 @@ dependencies = [ | |||
| 454 | ] | 436 | ] |
| 455 | 437 | ||
| 456 | [[package]] | 438 | [[package]] |
| 439 | name = "humantime" | ||
| 440 | version = "1.3.0" | ||
| 441 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 442 | dependencies = [ | ||
| 443 | "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 444 | ] | ||
| 445 | |||
| 446 | [[package]] | ||
| 457 | name = "idna" | 447 | name = "idna" |
| 458 | version = "0.2.0" | 448 | version = "0.2.0" |
| 459 | source = "registry+https://github.com/rust-lang/crates.io-index" | 449 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -723,15 +713,6 @@ dependencies = [ | |||
| 723 | ] | 713 | ] |
| 724 | 714 | ||
| 725 | [[package]] | 715 | [[package]] |
| 726 | name = "num-integer" | ||
| 727 | version = "0.1.41" | ||
| 728 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 729 | dependencies = [ | ||
| 730 | "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 731 | "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 732 | ] | ||
| 733 | |||
| 734 | [[package]] | ||
| 735 | name = "num-traits" | 716 | name = "num-traits" |
| 736 | version = "0.2.10" | 717 | version = "0.2.10" |
| 737 | source = "registry+https://github.com/rust-lang/crates.io-index" | 718 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -928,7 +909,7 @@ dependencies = [ | |||
| 928 | name = "ra_cli" | 909 | name = "ra_cli" |
| 929 | version = "0.1.0" | 910 | version = "0.1.0" |
| 930 | dependencies = [ | 911 | dependencies = [ |
| 931 | "flexi_logger 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", | 912 | "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
| 932 | "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 913 | "pico-args 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
| 933 | "ra_batch 0.1.0", | 914 | "ra_batch 0.1.0", |
| 934 | "ra_db 0.1.0", | 915 | "ra_db 0.1.0", |
| @@ -1060,7 +1041,7 @@ name = "ra_lsp_server" | |||
| 1060 | version = "0.1.0" | 1041 | version = "0.1.0" |
| 1061 | dependencies = [ | 1042 | dependencies = [ |
| 1062 | "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1043 | "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
| 1063 | "flexi_logger 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)", | 1044 | "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
| 1064 | "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1045 | "jod-thread 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", |
| 1065 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", | 1046 | "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", |
| 1066 | "lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", | 1047 | "lsp-server 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", |
| @@ -1648,16 +1629,6 @@ dependencies = [ | |||
| 1648 | ] | 1629 | ] |
| 1649 | 1630 | ||
| 1650 | [[package]] | 1631 | [[package]] |
| 1651 | name = "time" | ||
| 1652 | version = "0.1.42" | ||
| 1653 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1654 | dependencies = [ | ||
| 1655 | "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 1656 | "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 1657 | "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 1658 | ] | ||
| 1659 | |||
| 1660 | [[package]] | ||
| 1661 | name = "unicase" | 1632 | name = "unicase" |
| 1662 | version = "2.6.0" | 1633 | version = "2.6.0" |
| 1663 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1634 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| @@ -1798,11 +1769,6 @@ dependencies = [ | |||
| 1798 | "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", | 1769 | "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", |
| 1799 | ] | 1770 | ] |
| 1800 | 1771 | ||
| 1801 | [[package]] | ||
| 1802 | name = "yansi" | ||
| 1803 | version = "0.5.0" | ||
| 1804 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| 1805 | |||
| 1806 | [metadata] | 1772 | [metadata] |
| 1807 | "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" | 1773 | "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" |
| 1808 | "checksum anyhow 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b412394828b7ca486b362f300b762d8e43dafd6f0d727b63f1cd2ade207c6cef" | 1774 | "checksum anyhow 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b412394828b7ca486b362f300b762d8e43dafd6f0d727b63f1cd2ade207c6cef" |
| @@ -1827,7 +1793,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1827 | "checksum chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1793 | "checksum chalk-macros 0.1.1 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" |
| 1828 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1794 | "checksum chalk-rust-ir 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" |
| 1829 | "checksum chalk-solve 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" | 1795 | "checksum chalk-solve 0.1.0 (git+https://github.com/jackh726/chalk.git?rev=095cd38a4f16337913bba487f2055b9ca0179f30)" = "<none>" |
| 1830 | "checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" | ||
| 1831 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" | 1796 | "checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" |
| 1832 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" | 1797 | "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" |
| 1833 | "checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" | 1798 | "checksum console 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f5d540c2d34ac9dd0deb5f3b5f54c36c79efa78f6b3ad19106a554d07a7b5d9f" |
| @@ -1843,9 +1808,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1843 | "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" | 1808 | "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" |
| 1844 | "checksum ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36" | 1809 | "checksum ena 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8944dc8fa28ce4a38f778bd46bf7d923fe73eed5a439398507246c8e017e6f36" |
| 1845 | "checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" | 1810 | "checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" |
| 1811 | "checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" | ||
| 1846 | "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" | 1812 | "checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" |
| 1847 | "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" | 1813 | "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33" |
| 1848 | "checksum flexi_logger 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a13ea6b8a4debecf47bf3966d56db0e21366bc3a3649ba159e1a9e6fdd36a4f4" | ||
| 1849 | "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" | 1814 | "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" |
| 1850 | "checksum format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aea5a5909a74969507051a3b17adc84737e31a5f910559892aedce026f4d53" | 1815 | "checksum format-buf 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f7aea5a5909a74969507051a3b17adc84737e31a5f910559892aedce026f4d53" |
| 1851 | "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" | 1816 | "checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" |
| @@ -1856,10 +1821,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1856 | "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" | 1821 | "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" |
| 1857 | "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" | 1822 | "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" |
| 1858 | "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" | 1823 | "checksum getrandom 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407" |
| 1859 | "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" | ||
| 1860 | "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" | 1824 | "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2" |
| 1861 | "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" | 1825 | "checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" |
| 1862 | "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" | 1826 | "checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120" |
| 1827 | "checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" | ||
| 1863 | "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" | 1828 | "checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" |
| 1864 | "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" | 1829 | "checksum indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712d7b3ea5827fcb9d4fda14bf4da5f136f0db2ae9c8f4bd4e2d1c6fde4e6db2" |
| 1865 | "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" | 1830 | "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718" |
| @@ -1891,7 +1856,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1891 | "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" | 1856 | "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" |
| 1892 | "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" | 1857 | "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" |
| 1893 | "checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b" | 1858 | "checksum notify 4.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "199628fc33b21bc767baa057490b00b382ecbae030803a7b36292422d15b778b" |
| 1894 | "checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" | ||
| 1895 | "checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" | 1859 | "checksum num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c81ffc11c212fa327657cb19dd85eb7419e163b5b076bede2bdb5c974c07e4" |
| 1896 | "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" | 1860 | "checksum num_cpus 1.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "76dac5ed2a876980778b8b85f75a71b6cbf0db0b1232ee12f826bccb00d09d72" |
| 1897 | "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed" | 1861 | "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed" |
| @@ -1964,7 +1928,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1964 | "checksum thin-dst 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c52fd98a9e4913c466d83381a59245691875d2f3e04611fca57f964bd8aa96e1" | 1928 | "checksum thin-dst 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c52fd98a9e4913c466d83381a59245691875d2f3e04611fca57f964bd8aa96e1" |
| 1965 | "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" | 1929 | "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" |
| 1966 | "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" | 1930 | "checksum threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" |
| 1967 | "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" | ||
| 1968 | "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" | 1931 | "checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" |
| 1969 | "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" | 1932 | "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" |
| 1970 | "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" | 1933 | "checksum unicode-normalization 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b561e267b2326bb4cebfc0ef9e68355c7abe6c6f522aeac2f5bf95d56c59bdcf" |
| @@ -1983,4 +1946,3 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
| 1983 | "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" | 1946 | "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" |
| 1984 | "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" | 1947 | "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" |
| 1985 | "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" | 1948 | "checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" |
| 1986 | "checksum yansi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" | ||
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml index c7e0d0f0f..21a37c7bf 100644 --- a/crates/ra_cli/Cargo.toml +++ b/crates/ra_cli/Cargo.toml | |||
| @@ -7,7 +7,7 @@ publish = false | |||
| 7 | 7 | ||
| 8 | [dependencies] | 8 | [dependencies] |
| 9 | pico-args = "0.3.0" | 9 | pico-args = "0.3.0" |
| 10 | flexi_logger = "0.14.0" | 10 | env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] } |
| 11 | 11 | ||
| 12 | ra_syntax = { path = "../ra_syntax" } | 12 | ra_syntax = { path = "../ra_syntax" } |
| 13 | ra_ide = { path = "../ra_ide" } | 13 | ra_ide = { path = "../ra_ide" } |
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs index fe847e611..3808590ab 100644 --- a/crates/ra_cli/src/main.rs +++ b/crates/ra_cli/src/main.rs | |||
| @@ -7,7 +7,6 @@ mod progress_report; | |||
| 7 | 7 | ||
| 8 | use std::{error::Error, fmt::Write, io::Read}; | 8 | use std::{error::Error, fmt::Write, io::Read}; |
| 9 | 9 | ||
| 10 | use flexi_logger::Logger; | ||
| 11 | use pico_args::Arguments; | 10 | use pico_args::Arguments; |
| 12 | use ra_ide::{file_structure, Analysis}; | 11 | use ra_ide::{file_structure, Analysis}; |
| 13 | use ra_prof::profile; | 12 | use ra_prof::profile; |
| @@ -32,7 +31,7 @@ impl Verbosity { | |||
| 32 | } | 31 | } |
| 33 | 32 | ||
| 34 | fn main() -> Result<()> { | 33 | fn main() -> Result<()> { |
| 35 | Logger::with_env_or_str("error").start()?; | 34 | env_logger::try_init()?; |
| 36 | 35 | ||
| 37 | let subcommand = match std::env::args_os().nth(1) { | 36 | let subcommand = match std::env::args_os().nth(1) { |
| 38 | None => { | 37 | None => { |
diff --git a/crates/ra_lsp_server/Cargo.toml b/crates/ra_lsp_server/Cargo.toml index 21aef842c..41672eaff 100644 --- a/crates/ra_lsp_server/Cargo.toml +++ b/crates/ra_lsp_server/Cargo.toml | |||
| @@ -13,7 +13,6 @@ relative-path = "1.0.0" | |||
| 13 | serde_json = "1.0.34" | 13 | serde_json = "1.0.34" |
| 14 | serde = { version = "1.0.83", features = ["derive"] } | 14 | serde = { version = "1.0.83", features = ["derive"] } |
| 15 | crossbeam-channel = "0.4" | 15 | crossbeam-channel = "0.4" |
| 16 | flexi_logger = "0.14.0" | ||
| 17 | log = "0.4.3" | 16 | log = "0.4.3" |
| 18 | lsp-types = { version = "0.61.0", features = ["proposed"] } | 17 | lsp-types = { version = "0.61.0", features = ["proposed"] } |
| 19 | rustc-hash = "1.0" | 18 | rustc-hash = "1.0" |
| @@ -27,6 +26,7 @@ lsp-server = "0.3.0" | |||
| 27 | ra_project_model = { path = "../ra_project_model" } | 26 | ra_project_model = { path = "../ra_project_model" } |
| 28 | ra_prof = { path = "../ra_prof" } | 27 | ra_prof = { path = "../ra_prof" } |
| 29 | ra_vfs_glob = { path = "../ra_vfs_glob" } | 28 | ra_vfs_glob = { path = "../ra_vfs_glob" } |
| 29 | env_logger = { version = "0.7.1", default-features = false, features = ["humantime"] } | ||
| 30 | 30 | ||
| 31 | [dev-dependencies] | 31 | [dev-dependencies] |
| 32 | tempfile = "3" | 32 | tempfile = "3" |
diff --git a/crates/ra_lsp_server/src/main.rs b/crates/ra_lsp_server/src/main.rs index e13c8ca14..8076a7fa5 100644 --- a/crates/ra_lsp_server/src/main.rs +++ b/crates/ra_lsp_server/src/main.rs | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | //! `ra_lsp_server` binary | 1 | //! `ra_lsp_server` binary |
| 2 | 2 | ||
| 3 | use flexi_logger::{Duplicate, Logger}; | ||
| 4 | use lsp_server::Connection; | 3 | use lsp_server::Connection; |
| 5 | use ra_lsp_server::{show_message, Result, ServerConfig}; | 4 | use ra_lsp_server::{show_message, Result, ServerConfig}; |
| 6 | use ra_prof; | 5 | use ra_prof; |
| @@ -14,11 +13,7 @@ fn main() -> Result<()> { | |||
| 14 | fn setup_logging() -> Result<()> { | 13 | fn setup_logging() -> Result<()> { |
| 15 | std::env::set_var("RUST_BACKTRACE", "short"); | 14 | std::env::set_var("RUST_BACKTRACE", "short"); |
| 16 | 15 | ||
| 17 | let logger = Logger::with_env_or_str("error").duplicate_to_stderr(Duplicate::All); | 16 | env_logger::try_init()?; |
| 18 | match std::env::var("RA_LOG_DIR") { | ||
| 19 | Ok(ref v) if v == "1" => logger.log_to_file().directory("log").start()?, | ||
| 20 | _ => logger.start()?, | ||
| 21 | }; | ||
| 22 | 17 | ||
| 23 | ra_prof::set_filter(match std::env::var("RA_PROFILE") { | 18 | ra_prof::set_filter(match std::env::var("RA_PROFILE") { |
| 24 | Ok(spec) => ra_prof::Filter::from_spec(&spec), | 19 | Ok(spec) => ra_prof::Filter::from_spec(&spec), |
diff --git a/crates/ra_lsp_server/tests/heavy_tests/main.rs b/crates/ra_lsp_server/tests/heavy_tests/main.rs index 2ba82ab05..29224cbe8 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/main.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/main.rs | |||
| @@ -15,7 +15,6 @@ use tempfile::TempDir; | |||
| 15 | 15 | ||
| 16 | use crate::support::{project, Project}; | 16 | use crate::support::{project, Project}; |
| 17 | 17 | ||
| 18 | const LOG: &'static str = ""; | ||
| 19 | const PROFILE: &'static str = ""; | 18 | const PROFILE: &'static str = ""; |
| 20 | // const PROFILE: &'static str = "*@3>100"; | 19 | // const PROFILE: &'static str = "*@3>100"; |
| 21 | 20 | ||
diff --git a/crates/ra_lsp_server/tests/heavy_tests/support.rs b/crates/ra_lsp_server/tests/heavy_tests/support.rs index 86073b57d..d5ea52fa9 100644 --- a/crates/ra_lsp_server/tests/heavy_tests/support.rs +++ b/crates/ra_lsp_server/tests/heavy_tests/support.rs | |||
| @@ -7,7 +7,6 @@ use std::{ | |||
| 7 | }; | 7 | }; |
| 8 | 8 | ||
| 9 | use crossbeam_channel::{after, select, Receiver}; | 9 | use crossbeam_channel::{after, select, Receiver}; |
| 10 | use flexi_logger::Logger; | ||
| 11 | use lsp_server::{Connection, Message, Notification, Request}; | 10 | use lsp_server::{Connection, Message, Notification, Request}; |
| 12 | use lsp_types::{ | 11 | use lsp_types::{ |
| 13 | notification::{DidOpenTextDocument, Exit}, | 12 | notification::{DidOpenTextDocument, Exit}, |
| @@ -53,7 +52,7 @@ impl<'a> Project<'a> { | |||
| 53 | let tmp_dir = self.tmp_dir.unwrap_or_else(|| TempDir::new().unwrap()); | 52 | let tmp_dir = self.tmp_dir.unwrap_or_else(|| TempDir::new().unwrap()); |
| 54 | static INIT: Once = Once::new(); | 53 | static INIT: Once = Once::new(); |
| 55 | INIT.call_once(|| { | 54 | INIT.call_once(|| { |
| 56 | let _ = Logger::with_env_or_str(crate::LOG).start().unwrap(); | 55 | let _ = env_logger::builder().is_test(true).try_init().unwrap(); |
| 57 | ra_prof::set_filter(if crate::PROFILE.is_empty() { | 56 | ra_prof::set_filter(if crate::PROFILE.is_empty() { |
| 58 | ra_prof::Filter::disabled() | 57 | ra_prof::Filter::disabled() |
| 59 | } else { | 58 | } else { |
diff --git a/docs/dev/README.md b/docs/dev/README.md index 0f64d7e5f..2f6215d6b 100644 --- a/docs/dev/README.md +++ b/docs/dev/README.md | |||
| @@ -124,9 +124,8 @@ Logging is done by both rust-analyzer and VS Code, so it might be tricky to | |||
| 124 | figure out where logs go. | 124 | figure out where logs go. |
| 125 | 125 | ||
| 126 | Inside rust-analyzer, we use the standard `log` crate for logging, and | 126 | Inside rust-analyzer, we use the standard `log` crate for logging, and |
| 127 | `flexi_logger` for logging frotend. By default, log goes to stderr (the same as | 127 | `env_logger` for logging frontend. By default, log goes to stderr, but the |
| 128 | with `env_logger`), but the stderr itself is processed by VS Code. To mirror | 128 | stderr itself is processed by VS Code. |
| 129 | logs to a `./log` directory, set `RA_LOG_DIR=1` environmental variable. | ||
| 130 | 129 | ||
| 131 | To see stderr in the running VS Code instance, go to the "Output" tab of the | 130 | To see stderr in the running VS Code instance, go to the "Output" tab of the |
| 132 | panel and select `rust-analyzer`. This shows `eprintln!` as well. Note that | 131 | panel and select `rust-analyzer`. This shows `eprintln!` as well. Note that |