Merge remote-tracking branch 'upstream/master' into issue961_profiling

This commit is contained in:
Sergey Parilin 2019-04-02 17:55:14 +03:00
commit b74449e995
54 changed files with 1943 additions and 1180 deletions

View file

@ -5,7 +5,7 @@ use std::{fs, io::Read, path::Path};
use clap::{App, Arg, SubCommand};
use join_to_string::join;
use ra_ide_api::{Analysis, FileRange};
use ra_ide_api_light::file_structure;
use ra_ide_api::file_structure;
use ra_syntax::{SourceFile, TextRange, TreeArc, AstNode};
use tools::collect_tests;
use flexi_logger::Logger;