Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit db6a9e0

Browse files
authored
Merge pull request #1696 from calebcartwright/racer-rustfmt-bump
bump racer and rustfmt versions
2 parents 48ef96d + d9745da commit db6a9e0

8 files changed

+118
-80
lines changed

Cargo.lock

Lines changed: 106 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ lsp-types = { version = "0.60", features = ["proposed"] }
4242
lazy_static = "1"
4343
log = "0.4"
4444
num_cpus = "1"
45-
racer = { version = "2.1.37", default-features = false }
45+
racer = { version = "2.1.38", default-features = false }
4646
rand = "0.7"
4747
rayon = "1"
4848
rustc_tools_util = "0.2"
49-
rustfmt-nightly = { version = "1.4.20", git = "https://github.com/rust-lang/rustfmt", branch = "rustfmt-1.4.20" }
49+
rustfmt-nightly = { version = "1.4.21", git = "https://github.com/rust-lang/rustfmt", branch = "rustfmt-1.4.21" }
5050
serde = "1.0"
5151
serde_json = "1.0"
5252
serde_derive = "1.0"

ci/azure-install-rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
set -e
55
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
66
export PATH=$PATH:$HOME/.cargo/bin
7-
rustup toolchain install $RUSTUP_TOOLCHAIN
7+
rustup toolchain install $RUSTUP_TOOLCHAIN --force
88
rustup default $RUSTUP_TOOLCHAIN
99
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
1010
env:
@@ -17,7 +17,7 @@ steps:
1717
curl -sSf -o rustup-init.exe https://win.rustup.rs
1818
rustup-init.exe -y --default-toolchain none
1919
set PATH=%PATH%;%USERPROFILE%\.cargo\bin
20-
rustup toolchain install %RUSTUP_TOOLCHAIN%
20+
rustup toolchain install %RUSTUP_TOOLCHAIN% --force
2121
rustup default %RUSTUP_TOOLCHAIN%
2222
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
2323
env:

tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"data": {
88
"Ok": [{
99
"language": "rust",
10-
"value": "libstd/sync/mod.rs"
10+
"value": "std/src/sync/mod.rs"
1111
},
12-
"Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code."
12+
"Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code.\n\nConsider the following code, operating on some global static variables:\n\n```rust\nstatic mut A: u32 = 0;"
1313
]
1414
}
1515
}

tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"data": {
88
"Ok": [{
99
"language": "rust",
10-
"value": "libstd/sync/mod.rs"
10+
"value": "std/src/sync/mod.rs"
1111
},
12-
"Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code."
12+
"Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code.\n\nConsider the following code, operating on some global static variables:\n\n```rust\nstatic mut A: u32 = 0;"
1313
]
1414
}
1515
}

tests/fixtures/hover/save_data/test_tooltip_std.rs.0009_012.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"language": "rust",
1111
"value": "pub fn push(&mut self, value: T)"
1212
},
13-
"Appends an element to the back of a collection.\n\n# Panics\n\nPanics if the number of elements in the vector overflows a `usize`.\n\n# Examples\n\n```rust\nlet mut vec = vec![1, 2];\nvec.push(3);\nassert_eq!(vec, [1, 2, 3]);\n```"
13+
"Appends an element to the back of a collection.\n\n# Panics\n\nPanics if the new capacity exceeds `isize::MAX` bytes.\n\n# Examples\n\n```rust\nlet mut vec = vec![1, 2];\nvec.push(3);\nassert_eq!(vec, [1, 2, 3]);\n```"
1414
]
1515
}
1616
}

tests/fixtures/hover/save_data/test_tooltip_std.rs.0015_017.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"Ok": [
99
{
1010
"language": "rust",
11-
"value": "src/liballoc/string.rs"
11+
"value": "library/alloc/src/string.rs"
1212
},
1313
"https://doc.rust-lang.org/nightly/alloc/string/",
14-
"A UTF-8 encoded, growable string.\n\nThis module contains the [`String`] type, a trait for converting\n[`ToString`]s, and several error types that may result from working with\n[`String`]s.\n\n[`ToString`]: trait.ToString.html\n\n# Examples\n\nThere are multiple ways to create a new [`String`] from a string literal:\n\n```rust\nlet s = \"Hello\".to_string();\n\nlet s = String::from(\"world\");\nlet s: String = \"also this\".into();\n```\n\nYou can create a new [`String`] from an existing one by concatenating with\n`+`:\n\n[`String`]: struct.String.html\n\n```rust\nlet s = \"Hello\".to_string();\n\nlet message = s + \" world!\";\n```\n\nIf you have a vector of valid UTF-8 bytes, you can make a [`String`] out of\nit. You can do the reverse too.\n\n```rust\nlet sparkle_heart = vec![240, 159, 146, 150];\n\n// We know these bytes are valid, so we'll use `unwrap()`.\nlet sparkle_heart = String::from_utf8(sparkle_heart).unwrap();\n\nassert_eq!(\"💖\", sparkle_heart);\n\nlet bytes = sparkle_heart.into_bytes();\n\nassert_eq!(bytes, [240, 159, 146, 150]);\n```"
14+
"A UTF-8 encoded, growable string.\n\nThis module contains the [`String`] type, a trait for converting\n[`ToString`]s, and several error types that may result from working with\n[`String`]s.\n\n# Examples\n\nThere are multiple ways to create a new [`String`] from a string literal:\n\n```rust\nlet s = \"Hello\".to_string();\n\nlet s = String::from(\"world\");\nlet s: String = \"also this\".into();\n```\n\nYou can create a new [`String`] from an existing one by concatenating with\n`+`:\n\n```rust\nlet s = \"Hello\".to_string();\n\nlet message = s + \" world!\";\n```\n\nIf you have a vector of valid UTF-8 bytes, you can make a [`String`] out of\nit. You can do the reverse too.\n\n```rust\nlet sparkle_heart = vec![240, 159, 146, 150];\n\n// We know these bytes are valid, so we'll use `unwrap()`.\nlet sparkle_heart = String::from_utf8(sparkle_heart).unwrap();\n\nassert_eq!(\"💖\", sparkle_heart);\n\nlet bytes = sparkle_heart.into_bytes();\n\nassert_eq!(bytes, [240, 159, 146, 150]);\n```"
1515
]
1616
}
1717
}

tests/fixtures/hover/save_data/test_tooltip_std.rs.0015_025.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"value": "pub trait ToString"
1212
},
1313
"https://doc.rust-lang.org/nightly/alloc/string/ToString.t.html",
14-
"A trait for converting a value to a `String`.\n\nThis trait is automatically implemented for any type which implements the\n[`Display`] trait. As such, `ToString` shouldn't be implemented directly:\n[`Display`] should be implemented instead, and you get the `ToString`\nimplementation for free.\n\n[`Display`]: ../../std/fmt/trait.Display.html"
14+
"A trait for converting a value to a `String`.\n\nThis trait is automatically implemented for any type which implements the\n[`Display`] trait. As such, `ToString` shouldn't be implemented directly:\n[`Display`] should be implemented instead, and you get the `ToString`\nimplementation for free.\n\n[`Display`]: fmt::Display"
1515
]
1616
}
1717
}

0 commit comments

Comments
 (0)