Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-16 09:48:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #318

Browse source 
318: Remove a completed and an unactionable todo r=matklad a=DJMcNab



Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
This commit is contained in:
bors[bot] 2018-12-21 22:48:57 +00:00
commit f2581a4a29
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_syntax/src/lexer.rs
View file

@ -160,7 +160,7 @@ fn next_token_inner(c: char, ptr: &mut Ptr) -> SyntaxKind {
// if we find one, then this is an invalid character literal // if we find one, then this is an invalid character literal
if ptr.at('\'') { if ptr.at('\'') {
ptr.bump(); ptr.bump();
return CHAR; // TODO: error reporting return CHAR;
} }
LIFETIME LIFETIME
} else { } else {

12
crates/ra_syntax/tests/test.rs
View file

@ -65,14 +65,10 @@ fn self_hosting_parsing() {
for entry in walkdir::WalkDir::new(dir) for entry in walkdir::WalkDir::new(dir)
.into_iter() .into_iter()
.filter_entry(|entry| { .filter_entry(|entry| {
!entry !entry.path().components().any(|component| {
.path() // Get all files which are not in the crates/ra_syntax/tests/data folder
.components() component == Component::Normal(OsStr::new("data"))
// TODO: this more neatly })
.any(|component| {
// Get all files which are not in the crates/ra_syntax/tests/data folder
component == Component::Normal(OsStr::new("data"))
})
}) })
.map(|e| e.unwrap()) .map(|e| e.unwrap())
.filter(|entry| { .filter(|entry| {