mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #6531

Browse Source 
6531: Update crates r=matklad a=kjeremy



Co-authored-by: kjeremy <kjeremy@gmail.com>
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-11-12 10:23:40 +00:00 committed by GitHub
commit 802665873d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 191 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Cargo.lock generated
View File

@ -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",

27
crates/rust-analyzer/src/diagnostics/test_data/clippy_pass_by_ref.txt
View File

@ -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,

9
crates/rust-analyzer/src/diagnostics/test_data/handles_macro_location.txt
View File

@ -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 {

36
crates/rust-analyzer/src/diagnostics/test_data/macro_compiler_error.txt
View File

@ -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,

9
crates/rust-analyzer/src/diagnostics/test_data/rustc_incompatible_type_for_trait.txt
View File

@ -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 {

9
crates/rust-analyzer/src/diagnostics/test_data/rustc_mismatched_type.txt
View File

@ -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 {

18
crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable.txt
View File

@ -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 {

18
crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_hint.txt
View File

@ -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 {

18
crates/rust-analyzer/src/diagnostics/test_data/rustc_unused_variable_as_info.txt
View File

@ -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 {

18
crates/rust-analyzer/src/diagnostics/test_data/rustc_wrong_number_of_parameters.txt
View File

@ -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,

27
crates/rust-analyzer/src/diagnostics/test_data/snap_multi_line_fix.txt
View File

@ -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 {

2
crates/syntax/Cargo.toml
View File

@ -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"