diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-01 08:55:03 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-01 08:55:03 +0000 |
commit | 14cc62636757c3ef043633fe12f8bd9d9ff590bd (patch) | |
tree | e018d3aae6d5a8e3b5df0717b6c78c0227c0239c /crates | |
parent | 5df3ee8274fdb7cdeb2b0871b4efea8cbf4724a1 (diff) | |
parent | cb39f2df9457ea372a5f870a3274b341a8f41c7f (diff) |
Merge #7818
7818: Clean up warnings r=matklad a=bugadani
Co-authored-by: Dániel Buga <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r-- | crates/mbe/src/benchmark.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/tests/rust-analyzer/main.rs | 2 | ||||
-rw-r--r-- | crates/rust-analyzer/tests/rust-analyzer/support.rs | 14 |
3 files changed, 2 insertions, 16 deletions
diff --git a/crates/mbe/src/benchmark.rs b/crates/mbe/src/benchmark.rs index 0d0acd589..6d81be880 100644 --- a/crates/mbe/src/benchmark.rs +++ b/crates/mbe/src/benchmark.rs | |||
@@ -177,7 +177,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt | |||
177 | let c = 1013904223; | 177 | let c = 1013904223; |
178 | *seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c); | 178 | *seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c); |
179 | return *seed; | 179 | return *seed; |
180 | }; | 180 | } |
181 | fn make_ident(ident: &str) -> tt::TokenTree { | 181 | fn make_ident(ident: &str) -> tt::TokenTree { |
182 | tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) }) | 182 | tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) }) |
183 | .into() | 183 | .into() |
diff --git a/crates/rust-analyzer/tests/rust-analyzer/main.rs b/crates/rust-analyzer/tests/rust-analyzer/main.rs index 80bde29b9..391a0b60d 100644 --- a/crates/rust-analyzer/tests/rust-analyzer/main.rs +++ b/crates/rust-analyzer/tests/rust-analyzer/main.rs | |||
@@ -54,7 +54,6 @@ version = "0.0.0" | |||
54 | use std::collections::Spam; | 54 | use std::collections::Spam; |
55 | "#, | 55 | "#, |
56 | ) | 56 | ) |
57 | .with_sysroot(true) | ||
58 | .server() | 57 | .server() |
59 | .wait_until_workspace_is_loaded(); | 58 | .wait_until_workspace_is_loaded(); |
60 | 59 | ||
@@ -451,7 +450,6 @@ fn main() {{}} | |||
451 | "#, | 450 | "#, |
452 | librs, libs | 451 | librs, libs |
453 | )) | 452 | )) |
454 | .with_sysroot(true) | ||
455 | .server() | 453 | .server() |
456 | .wait_until_workspace_is_loaded(); | 454 | .wait_until_workspace_is_loaded(); |
457 | 455 | ||
diff --git a/crates/rust-analyzer/tests/rust-analyzer/support.rs b/crates/rust-analyzer/tests/rust-analyzer/support.rs index 453ce4fa8..726d555e4 100644 --- a/crates/rust-analyzer/tests/rust-analyzer/support.rs +++ b/crates/rust-analyzer/tests/rust-analyzer/support.rs | |||
@@ -20,7 +20,6 @@ use crate::testdir::TestDir; | |||
20 | 20 | ||
21 | pub(crate) struct Project<'a> { | 21 | pub(crate) struct Project<'a> { |
22 | fixture: &'a str, | 22 | fixture: &'a str, |
23 | with_sysroot: bool, | ||
24 | tmp_dir: Option<TestDir>, | 23 | tmp_dir: Option<TestDir>, |
25 | roots: Vec<PathBuf>, | 24 | roots: Vec<PathBuf>, |
26 | config: serde_json::Value, | 25 | config: serde_json::Value, |
@@ -28,13 +27,7 @@ pub(crate) struct Project<'a> { | |||
28 | 27 | ||
29 | impl<'a> Project<'a> { | 28 | impl<'a> Project<'a> { |
30 | pub(crate) fn with_fixture(fixture: &str) -> Project { | 29 | pub(crate) fn with_fixture(fixture: &str) -> Project { |
31 | Project { | 30 | Project { fixture, tmp_dir: None, roots: vec![], config: serde_json::Value::Null } |
32 | fixture, | ||
33 | tmp_dir: None, | ||
34 | roots: vec![], | ||
35 | with_sysroot: false, | ||
36 | config: serde_json::Value::Null, | ||
37 | } | ||
38 | } | 31 | } |
39 | 32 | ||
40 | pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> { | 33 | pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> { |
@@ -47,11 +40,6 @@ impl<'a> Project<'a> { | |||
47 | self | 40 | self |
48 | } | 41 | } |
49 | 42 | ||
50 | pub(crate) fn with_sysroot(mut self, yes: bool) -> Project<'a> { | ||
51 | self.with_sysroot = yes; | ||
52 | self | ||
53 | } | ||
54 | |||
55 | pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> { | 43 | pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> { |
56 | self.config = config; | 44 | self.config = config; |
57 | self | 45 | self |