language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-30 23:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

reformat the world

Browse source
This commit is contained in:
Aleksey Kladov 2019-02-08 14:49:43 +03:00
parent 5cb1d41a30
commit 12e3b4c70b
129 changed files with 727 additions and 2509 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/test_utils/src/lib.rs
View file

@ -85,9 +85,7 @@ pub fn extract_ranges(mut text: &str, tag: &str) -> (Vec<TextRange>, String) {
stack.push(from);
} else if text.starts_with(&close) {
text = &text[close.len()..];
let from = stack
.pop()
.unwrap_or_else(|| panic!("unmatched </{}>", tag));
let from = stack.pop().unwrap_or_else(|| panic!("unmatched </{}>", tag));
let to = TextUnit::of_str(&res);
ranges.push(TextRange::from_to(from, to));
}
@ -131,10 +129,7 @@ pub fn parse_fixture(fixture: &str) -> Vec<FixtureEntry> {
macro_rules! flush {
() => {
if let Some(meta) = meta {
res.push(FixtureEntry {
meta: meta.to_string(),
text: buf.clone(),
});
res.push(FixtureEntry { meta: meta.to_string(), text: buf.clone() });
buf.clear();
}
};
@ -226,15 +221,13 @@ pub fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a
let mut l = l.iter().collect::<Vec<_>>();
let mut r = r.iter().collect::<Vec<_>>();
l.retain(
|l| match r.iter().position(|r| find_mismatch(l, r).is_none()) {
Some(i) => {
r.remove(i);
false
}
None => true,
},
);
l.retain(|l| match r.iter().position(|r| find_mismatch(l, r).is_none()) {
Some(i) => {
r.remove(i);
false
}
None => true,
});
if !l.is_empty() {
assert!(!r.is_empty());
@ -250,10 +243,7 @@ pub fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a
return Some((expected, actual));
}
l.values()
.zip(r.values())
.filter_map(|(l, r)| find_mismatch(l, r))
.nth(0)
l.values().zip(r.values()).filter_map(|(l, r)| find_mismatch(l, r)).nth(0)
}
(&Null, &Null) => None,
// magic string literal "{...}" acts as wildcard for any sub-JSON
@ -312,12 +302,7 @@ fn test_from_dir(dir: &Path) -> Vec<PathBuf> {
pub fn project_dir() -> PathBuf {
let dir = env!("CARGO_MANIFEST_DIR");
PathBuf::from(dir)
.parent()
.unwrap()
.parent()
.unwrap()
.to_owned()
PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned()
}
/// Read file and normalize newlines.

5
crates/test_utils/src/marks.rs
View file

@ -64,10 +64,7 @@ pub struct MarkChecker {
impl MarkChecker {
pub fn new(mark: &'static AtomicUsize) -> MarkChecker {
let value_on_entry = mark.load(Ordering::SeqCst);
MarkChecker {
mark,
value_on_entry,
}
MarkChecker { mark, value_on_entry }
}
}