From 74f1b21b0856b6c0e680557edf1914e83203718b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 24 May 2021 16:27:24 +0300 Subject: Bump chalk --- Cargo.lock | 16 ++++++++-------- crates/hir_ty/Cargo.toml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 76a26ea4e..2fca1f638 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -169,9 +169,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chalk-derive" -version = "0.64.0" +version = "0.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9acf2a9eab79ae7d44cd77ad86a8b1569d7a5e6d9a7db4a0a57a7344dd82c24" +checksum = "751a3cd9eeb24d7165e9f90daf1f10a23ffa16a7986f349027f8dfb60f51ee0c" dependencies = [ "proc-macro2", "quote", @@ -181,9 +181,9 @@ dependencies = [ [[package]] name = "chalk-ir" -version = "0.64.0" +version = "0.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877661627f54ba3666a72943c43b326cb170d60899e50a8426111e7a657ff032" +checksum = "4236da905504740d3f72cc8f0509aa01321cc236208e2c33b55eda2db74bc495" dependencies = [ "bitflags", "chalk-derive", @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "chalk-recursive" -version = "0.64.0" +version = "0.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072ffcf17243c2aa3e4b9ea6de3d29e7ef64cfdb0ceccaa431965070a1dc1475" +checksum = "7d0b123fe45a34c4cd5cb329650a0d163525d2acbe9d754a4538d3340884002e" dependencies = [ "chalk-derive", "chalk-ir", @@ -205,9 +205,9 @@ dependencies = [ [[package]] name = "chalk-solve" -version = "0.64.0" +version = "0.67.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d4920c9ef2b26dd0b98ffdf070e27fa31e0b6f637463132083cee597e3d326" +checksum = "9c54788f0ae3b38e2bb2266f395d462d988c64f92dbd55c68219908fd1ce7ddc" dependencies = [ "chalk-derive", "chalk-ir", diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml index 66b3418f2..a9994082a 100644 --- a/crates/hir_ty/Cargo.toml +++ b/crates/hir_ty/Cargo.toml @@ -18,9 +18,9 @@ ena = "0.14.0" log = "0.4.8" rustc-hash = "1.1.0" scoped-tls = "1" -chalk-solve = { version = "0.64", default-features = false } -chalk-ir = "0.64" -chalk-recursive = "0.64" +chalk-solve = { version = "0.67", default-features = false } +chalk-ir = "0.67" +chalk-recursive = "0.67" la-arena = { version = "0.2.0", path = "../../lib/arena" } stdx = { path = "../stdx", version = "0.0.0" } -- cgit v1.2.3 From 47afa4a5fc18eb84c4838848f02eca655b0256d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 24 May 2021 16:31:54 +0300 Subject: Bump misc deps --- Cargo.lock | 84 +++++++++++++++++++----------------- crates/ide/src/doc_links.rs | 6 +-- crates/rust-analyzer/src/to_proto.rs | 2 +- 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fca1f638..bc3709d55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "03345e98af8f3d786b6d9f656ccfa6ac316d954e92bc4841f0bba20789d5fb5a" dependencies = [ "gimli", ] @@ -72,16 +72,16 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.58" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88fb5a785d6b44fd9d6700935608639af1b8356de1e55d5f7c2740f4faa15d82" +checksum = "4717cfcbfaa661a0fd48f8453951837ae7e8f81e481fbb136e3202d72805a744" dependencies = [ "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object", + "object 0.24.0", "rustc-demangle", ] @@ -452,9 +452,9 @@ checksum = "e398fae362f4124bbe630d99519fb2d68a03e2e3a23b441028cdcdc4f4895687" [[package]] name = "gimli" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189" [[package]] name = "hashbrown" @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19f57db1baad9d09e43a3cd76dcf82ebdafd37d75c9498b87762dba77c93f15" +checksum = "b031475cb1b103ee221afb806a23d35e0570bf7271d7588762ceba8127ed43b3" dependencies = [ "bitflags", "inotify-sys", @@ -830,9 +830,9 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.89.0" +version = "0.89.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07731ecd4ee0654728359a5b95e2a254c857876c04b85225496a35d60345daa7" +checksum = "48b8a871b0a450bcec0e26d74a59583c8173cb9fb7d7f98889e18abb84838e0f" dependencies = [ "bitflags", "serde", @@ -999,6 +999,12 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +[[package]] +name = "object" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5b3dd1c072ee7963717671d1ca129f1048fda25edea6b752bfc71ac8854170" + [[package]] name = "once_cell" version = "1.7.2" @@ -1124,9 +1130,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -1140,7 +1146,7 @@ dependencies = [ "jod-thread", "log", "memmap2", - "object", + "object 0.23.0", "profile", "serde", "serde_json", @@ -1157,7 +1163,7 @@ dependencies = [ "libloading", "mbe", "memmap2", - "object", + "object 0.23.0", "proc_macro_api", "proc_macro_test", "serde_derive", @@ -1235,9 +1241,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg", "crossbeam-deque", @@ -1247,9 +1253,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1260,18 +1266,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dd92e586f7355c633911e11f77f3d12f04b1b1bd76a198bd34ae3af8341ef2" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "regex-syntax", ] @@ -1368,9 +1374,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" +checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" [[package]] name = "rustc-hash" @@ -1455,18 +1461,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -1496,9 +1502,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" +checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" dependencies = [ "proc-macro2", "quote", @@ -1548,9 +1554,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -1848,9 +1854,9 @@ checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "url" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", "idna", @@ -1957,18 +1963,18 @@ dependencies = [ [[package]] name = "xshell" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa25217c682f9f991d7889238a99e65eb8431c266d36e0f4e850a73773415473" +checksum = "eb15bb1b41eb14efe628006294c294e10c366e03a0283b9c2063fc27d97934c6" dependencies = [ "xshell-macros", ] [[package]] name = "xshell-macros" -version = "0.1.10" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4404d53d2113af4fa31c58326eb7b37d6d7bf11ba87520787cddeaff45385c72" +checksum = "cf7ed94a2c75b9bcc57031229be2b57ee47ba71122f71aabef8610ec66a97e52" [[package]] name = "xtask" diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs index 320694a17..ec3828ab2 100644 --- a/crates/ide/src/doc_links.rs +++ b/crates/ide/src/doc_links.rs @@ -286,7 +286,7 @@ fn get_doc_link(db: &RootDatabase, definition: Definition) -> Option { .and_then( |url| if let Some(fragment) = fragment { url.join(&fragment).ok() } else { Some(url) }, ) - .map(|url| url.into_string()) + .map(|url| url.into()) } fn rewrite_intra_doc_link( @@ -325,7 +325,7 @@ fn rewrite_intra_doc_link( }; } - Some((new_url.into_string(), strip_prefixes_suffixes(title).to_string())) + Some((new_url.into(), strip_prefixes_suffixes(title).to_string())) } /// Try to resolve path to local documentation via path-based links (i.e. `../gateway/struct.Shard.html`). @@ -345,7 +345,7 @@ fn rewrite_url_link(db: &RootDatabase, def: ModuleDef, target: &str) -> Option lsp_types::Url { // Note: lowercasing the `path` itself doesn't help, the `Url::parse` // machinery *also* canonicalizes the drive letter. So, just massage the // string in place. - let mut url = url.into_string(); + let mut url: String = url.into(); url[driver_letter_range].make_ascii_lowercase(); lsp_types::Url::parse(&url).unwrap() } -- cgit v1.2.3 From d525cfc85a0fe798a85036543ccfa8858c4fbc04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 24 May 2021 16:35:23 +0300 Subject: Bump object --- Cargo.lock | 12 +++--------- crates/proc_macro_api/Cargo.toml | 2 +- crates/proc_macro_srv/Cargo.toml | 2 +- crates/proc_macro_srv/src/dylib.rs | 2 +- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc3709d55..0b51ce6af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,7 +81,7 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.24.0", + "object", "rustc-demangle", ] @@ -993,12 +993,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" - [[package]] name = "object" version = "0.24.0" @@ -1146,7 +1140,7 @@ dependencies = [ "jod-thread", "log", "memmap2", - "object 0.23.0", + "object", "profile", "serde", "serde_json", @@ -1163,7 +1157,7 @@ dependencies = [ "libloading", "mbe", "memmap2", - "object 0.23.0", + "object", "proc_macro_api", "proc_macro_test", "serde_derive", diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml index 2ce5eeedd..6fa880d61 100644 --- a/crates/proc_macro_api/Cargo.toml +++ b/crates/proc_macro_api/Cargo.toml @@ -16,7 +16,7 @@ log = "0.4.8" crossbeam-channel = "0.5.0" jod-thread = "0.1.1" memmap2 = "0.2.0" -object = { version = "0.23.0", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } +object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } snap = "1.0" tt = { path = "../tt", version = "0.0.0" } diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc_macro_srv/Cargo.toml index 63b3f1532..4ea41175e 100644 --- a/crates/proc_macro_srv/Cargo.toml +++ b/crates/proc_macro_srv/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" doctest = false [dependencies] -object = { version = "0.23", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] } +object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] } libloading = "0.7.0" memmap2 = "0.2.0" diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc_macro_srv/src/dylib.rs index baf10fea9..cccc53220 100644 --- a/crates/proc_macro_srv/src/dylib.rs +++ b/crates/proc_macro_srv/src/dylib.rs @@ -27,7 +27,7 @@ fn find_registrar_symbol(file: &Path) -> io::Result> { let file = File::open(file)?; let buffer = unsafe { Mmap::map(&file)? }; - Ok(object::File::parse(&buffer) + Ok(object::File::parse(&*buffer) .map_err(invalid_data_err)? .exports() .map_err(invalid_data_err)? -- cgit v1.2.3 From f1cfbe6ffc47e69709530dc8bb42543542760851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 24 May 2021 16:35:52 +0300 Subject: Disable `unaliged` feature of `object` --- crates/proc_macro_api/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc_macro_api/Cargo.toml index 6fa880d61..2c4da394b 100644 --- a/crates/proc_macro_api/Cargo.toml +++ b/crates/proc_macro_api/Cargo.toml @@ -16,7 +16,7 @@ log = "0.4.8" crossbeam-channel = "0.5.0" jod-thread = "0.1.1" memmap2 = "0.2.0" -object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe", "unaligned"] } +object = { version = "0.24", default-features = false, features = ["std", "read_core", "elf", "macho", "pe"] } snap = "1.0" tt = { path = "../tt", version = "0.0.0" } -- cgit v1.2.3 From b43bc61981302aea67ed806ce5669df8dacf6227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 24 May 2021 16:39:19 +0300 Subject: Bump rustc_lexer --- Cargo.lock | 4 ++-- crates/syntax/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0b51ce6af..557d5f5f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1359,9 +1359,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "716.0.0" +version = "720.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12eac7554c1d3f49f105f14d53c0f3402220e875983113562701d8e597a0995c" +checksum = "a025b453b0ae85335336f991f920ca9af5c0dc851171cb9035a16cea5619e9b2" dependencies = [ "unicode-xid", ] diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index 747f0b9eb..a6c294245 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -14,7 +14,7 @@ doctest = false cov-mark = { version = "1.1", features = ["thread-local"] } itertools = "0.10.0" rowan = "=0.13.0-pre.6" -rustc_lexer = { version = "716.0.0", package = "rustc-ap-rustc_lexer" } +rustc_lexer = { version = "720.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" arrayvec = "0.7" once_cell = "1.3.1" -- cgit v1.2.3 From 741f47f208e7b471c1b03b3b09317612b3f9dd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 24 May 2021 16:59:06 +0300 Subject: Update test fixtures --- .../src/tests/fixtures/test_serialize_proc_macro.txt | 2 +- .../src/diagnostics/test_data/clippy_pass_by_ref.txt | 11 +++++++++++ .../src/diagnostics/test_data/handles_macro_location.txt | 2 ++ .../src/diagnostics/test_data/macro_compiler_error.txt | 7 +++++++ .../test_data/rustc_incompatible_type_for_trait.txt | 2 ++ .../src/diagnostics/test_data/rustc_mismatched_type.txt | 2 ++ .../src/diagnostics/test_data/rustc_unused_variable.txt | 5 +++++ .../diagnostics/test_data/rustc_unused_variable_as_hint.txt | 5 +++++ .../diagnostics/test_data/rustc_unused_variable_as_info.txt | 5 +++++ .../test_data/rustc_wrong_number_of_parameters.txt | 6 ++++++ .../src/diagnostics/test_data/snap_multi_line_fix.txt | 11 +++++++++++ 11 files changed, 57 insertions(+), 1 deletion(-) 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 fa581f110..eb67c7134 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 @@ -23,7 +23,7 @@ SUBTREE $ SUBTREE [] 4294967295 IDENT allow 4294967295 SUBTREE () 4294967295 - IDENT rust_2018_idioms 4294967295 + IDENT unused_extern_crates 4294967295 PUNCH , [alone] 4294967295 IDENT clippy 4294967295 PUNCH : [joint] 4294967295 diff --git a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt index 227d96d51..bcc889681 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -33,6 +34,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -59,6 +61,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -84,6 +87,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -115,6 +119,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -146,6 +151,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -172,6 +178,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -203,6 +210,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -234,6 +242,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -260,6 +269,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -301,6 +311,7 @@ { Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, diff --git a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt index e5f01fb33..d5ab03576 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -33,6 +34,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( diff --git a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt index c847bbb35..8bee4cfe1 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -36,6 +37,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -67,6 +69,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -101,6 +104,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -132,6 +136,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -166,6 +171,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -191,6 +197,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt index 0d16af232..ada540ea6 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -33,6 +34,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt index 31b6a12ce..05074a914 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -33,6 +34,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt index f8adfad3b..749f49438 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -40,6 +41,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -75,6 +77,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -113,6 +116,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -154,6 +158,7 @@ { Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt index 5a70d2ed7..d20a91b39 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -40,6 +41,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -75,6 +77,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -113,6 +116,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -154,6 +158,7 @@ { Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt index 04ca0c9c2..2a9c3a9af 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -40,6 +41,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -75,6 +77,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -113,6 +116,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -154,6 +158,7 @@ { Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, diff --git a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt index f7a313cf1..5ea27a152 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -33,6 +34,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -59,6 +61,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -90,6 +93,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -121,6 +125,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -147,6 +152,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, diff --git a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt index 57d2f1ae3..43b1ea765 100644 --- a/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt +++ b/crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt @@ -2,6 +2,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -33,6 +34,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -59,6 +61,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -84,6 +87,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -115,6 +119,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -146,6 +151,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -172,6 +178,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -203,6 +210,7 @@ MappedRustDiagnostic { url: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -234,6 +242,7 @@ CodeDescription { href: Url { scheme: "https", + cannot_be_a_base: false, username: "", password: None, host: Some( @@ -260,6 +269,7 @@ location: Location { uri: Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, @@ -301,6 +311,7 @@ { Url { scheme: "file", + cannot_be_a_base: false, username: "", password: None, host: None, -- cgit v1.2.3