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 --- crates/hir_ty/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates') 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 --- crates/ide/src/doc_links.rs | 6 +++--- crates/rust-analyzer/src/to_proto.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'crates') 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 --- crates/proc_macro_api/Cargo.toml | 2 +- crates/proc_macro_srv/Cargo.toml | 2 +- crates/proc_macro_srv/src/dylib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crates') 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(-) (limited to 'crates') 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 --- crates/syntax/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates') 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(-) (limited to 'crates') 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