diff --git a/Cargo.lock b/Cargo.lock index c5645b2d255..4940110684d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -139,9 +139,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.61" +version = "1.0.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40" [[package]] name = "cfg" @@ -398,11 +398,11 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed85775dcc68644b5c950ac06a2b23768d3bc9390464151aaf27136998dcf9e" +checksum = "0c122a393ea57648015bf06fbd3d372378992e86b9ff5a7a497b076a28c79efe" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi 0.3.9", @@ -438,6 +438,16 @@ dependencies = [ "toolchain", ] +[[package]] +name = "form_urlencoded" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" +dependencies = [ + "matches", + "percent-encoding", +] + [[package]] name = "fsevent" version = "2.0.2" @@ -715,9 +725,9 @@ dependencies = [ [[package]] name = "inotify-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" +checksum = "c4563555856585ab3180a5bf0b2f9f8d301a728462afffc8195b3f5394229c55" dependencies = [ "libc", ] @@ -1384,9 +1394,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "686.0.0" +version = "688.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b04cd2159495584d976d501c5394498470c2e94e4f0cebb8186562d407a678" +checksum = "ebbdcc99bd015349093fcbae4780fda21416fec5d8843acfb3d1733e130cd4db" dependencies = [ "unicode-xid", ] @@ -1889,10 +1899,11 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" [[package]] name = "url" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" dependencies = [ + "form_urlencoded", "idna", "matches", "percent-encoding", 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 58d47d32a42..5b2e5187ac8 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/compiler/mir/tagset.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/compiler/mir/tagset.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -29,7 +36,14 @@ [ DiagnosticRelatedInformation { location: Location { - uri: "file:///test/compiler/lib.rs", + uri: Url { + scheme: "file", + host: None, + port: None, + path: "/test/compiler/lib.rs", + query: None, + fragment: None, + }, range: Range { start: Position { line: 0, @@ -45,7 +59,14 @@ }, DiagnosticRelatedInformation { location: Location { - uri: "file:///test/compiler/mir/tagset.rs", + uri: Url { + scheme: "file", + host: None, + port: None, + path: "/test/compiler/mir/tagset.rs", + query: None, + fragment: None, + }, range: Range { start: Position { line: 41, 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 6aa26bf63ab..116f0ff7342 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/src/main.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/src/main.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { 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 7aaffaba251..bbec6a7964a 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/crates/hir_def/src/data.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/crates/hir_def/src/data.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -25,7 +32,14 @@ [ DiagnosticRelatedInformation { location: Location { - uri: "file:///test/crates/hir_def/src/path.rs", + uri: Url { + scheme: "file", + host: None, + port: None, + path: "/test/crates/hir_def/src/path.rs", + query: None, + fragment: None, + }, range: Range { start: Position { line: 264, @@ -47,7 +61,14 @@ fixes: [], }, MappedRustDiagnostic { - url: "file:///test/crates/hir_def/src/path.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/crates/hir_def/src/path.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -72,7 +93,14 @@ [ DiagnosticRelatedInformation { location: Location { - uri: "file:///test/crates/hir_def/src/data.rs", + uri: Url { + scheme: "file", + host: None, + port: None, + path: "/test/crates/hir_def/src/data.rs", + query: None, + fragment: None, + }, range: Range { start: Position { line: 79, 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 58421342001..2cbf657e59f 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/compiler/ty/list_iter.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/compiler/ty/list_iter.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { 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 2610e4e209a..1142dc2ac67 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/runtime/compiler_support.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/runtime/compiler_support.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { 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 a8d85f00873..c709de95ffb 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/driver/subcommand/repl.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/driver/subcommand/repl.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -46,7 +53,14 @@ SnippetWorkspaceEdit { changes: Some( { - "file:///test/driver/subcommand/repl.rs": [ + Url { + scheme: "file", + host: None, + port: None, + path: "/test/driver/subcommand/repl.rs", + query: None, + fragment: None, + }: [ TextEdit { range: Range { start: Position { 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 0b893737665..632f438d7ad 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/driver/subcommand/repl.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/driver/subcommand/repl.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -46,7 +53,14 @@ SnippetWorkspaceEdit { changes: Some( { - "file:///test/driver/subcommand/repl.rs": [ + Url { + scheme: "file", + host: None, + port: None, + path: "/test/driver/subcommand/repl.rs", + query: None, + fragment: None, + }: [ TextEdit { range: Range { start: Position { 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 7fa9dee62ae..c0b79428d89 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/driver/subcommand/repl.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/driver/subcommand/repl.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -46,7 +53,14 @@ SnippetWorkspaceEdit { changes: Some( { - "file:///test/driver/subcommand/repl.rs": [ + Url { + scheme: "file", + host: None, + port: None, + path: "/test/driver/subcommand/repl.rs", + query: None, + fragment: None, + }: [ TextEdit { range: Range { start: Position { 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 ba1b98b335e..782c72dbdc5 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/compiler/ty/select.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/compiler/ty/select.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -29,7 +36,14 @@ [ DiagnosticRelatedInformation { location: Location { - uri: "file:///test/compiler/ty/select.rs", + uri: Url { + scheme: "file", + host: None, + port: None, + path: "/test/compiler/ty/select.rs", + query: None, + fragment: None, + }, range: Range { start: Position { line: 218, 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 3c97b20841f..d3f27ab6a54 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 @@ -1,6 +1,13 @@ [ MappedRustDiagnostic { - url: "file:///test/src/main.rs", + url: Url { + scheme: "file", + host: None, + port: None, + path: "/test/src/main.rs", + query: None, + fragment: None, + }, diagnostic: Diagnostic { range: Range { start: Position { @@ -29,7 +36,14 @@ [ DiagnosticRelatedInformation { location: Location { - uri: "file:///test/src/main.rs", + uri: Url { + scheme: "file", + host: None, + port: None, + path: "/test/src/main.rs", + query: None, + fragment: None, + }, range: Range { start: Position { line: 2, @@ -61,7 +75,14 @@ SnippetWorkspaceEdit { changes: Some( { - "file:///test/src/main.rs": [ + Url { + scheme: "file", + host: None, + port: None, + path: "/test/src/main.rs", + query: None, + fragment: None, + }: [ TextEdit { range: Range { start: Position { diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml index 61d2acb49cb..1fe907753d9 100644 --- a/crates/syntax/Cargo.toml +++ b/crates/syntax/Cargo.toml @@ -13,7 +13,7 @@ doctest = false [dependencies] itertools = "0.9.0" rowan = "0.10.0" -rustc_lexer = { version = "686.0.0", package = "rustc-ap-rustc_lexer" } +rustc_lexer = { version = "688.0.0", package = "rustc-ap-rustc_lexer" } rustc-hash = "1.1.0" arrayvec = "0.5.1" once_cell = "1.3.1"