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

Merge #7818

Browse Source 
7818: Clean up warnings r=matklad a=bugadani



Co-authored-by: Dániel Buga <bugadani@gmail.com>
This commit is contained in:
bors[bot] 2021-03-01 08:55:03 +00:00 committed by GitHub
commit 14cc626367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/mbe/src/benchmark.rs
View File

@ -177,7 +177,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
let c = 1013904223; let c = 1013904223;
*seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c); *seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c);
return *seed; return *seed;
}; }
fn make_ident(ident: &str) -> tt::TokenTree { fn make_ident(ident: &str) -> tt::TokenTree {
tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) }) tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) })
.into() .into()

2
crates/rust-analyzer/tests/rust-analyzer/main.rs
View File

@ -54,7 +54,6 @@ version = "0.0.0"
use std::collections::Spam; use std::collections::Spam;
"#, "#,
) )
.with_sysroot(true)
.server() .server()
.wait_until_workspace_is_loaded(); .wait_until_workspace_is_loaded();
@ -451,7 +450,6 @@ fn main() {{}}
"#, "#,
librs, libs librs, libs
)) ))
.with_sysroot(true)
.server() .server()
.wait_until_workspace_is_loaded(); .wait_until_workspace_is_loaded();

14
crates/rust-analyzer/tests/rust-analyzer/support.rs
View File

@ -20,7 +20,6 @@ use crate::testdir::TestDir;
pub(crate) struct Project<'a> { pub(crate) struct Project<'a> {
fixture: &'a str, fixture: &'a str,
with_sysroot: bool,
tmp_dir: Option<TestDir>, tmp_dir: Option<TestDir>,
roots: Vec<PathBuf>, roots: Vec<PathBuf>,
config: serde_json::Value, config: serde_json::Value,
@ -28,13 +27,7 @@ pub(crate) struct Project<'a> {
impl<'a> Project<'a> { impl<'a> Project<'a> {
pub(crate) fn with_fixture(fixture: &str) -> Project { pub(crate) fn with_fixture(fixture: &str) -> Project {
Project { Project { fixture, tmp_dir: None, roots: vec![], config: serde_json::Value::Null }
fixture,
tmp_dir: None,
roots: vec![],
with_sysroot: false,
config: serde_json::Value::Null,
}
} }
pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> { pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> {
@ -47,11 +40,6 @@ impl<'a> Project<'a> {
self self
} }
pub(crate) fn with_sysroot(mut self, yes: bool) -> Project<'a> {
self.with_sysroot = yes;
self
}
pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> { pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> {
self.config = config; self.config = config;
self self