Fix function calls

This commit is contained in:
Alan Du 2018-10-17 19:25:37 -04:00
parent fc8024de51
commit a5da770ec6
10 changed files with 9 additions and 12 deletions

View file

@ -183,8 +183,7 @@ impl Link {
root: ast::Root<'a>, root: ast::Root<'a>,
) -> ast::Module<'a> { ) -> ast::Module<'a> {
modules(root) modules(root)
.filter(|(name, _)| name == &tree.link(self).name) .find(|(name, _)| name == &tree.link(self).name)
.next()
.unwrap() .unwrap()
.1 .1
} }

View file

@ -393,7 +393,7 @@ impl AnalysisImpl {
// If we have a method call eat the first param since it's just self. // If we have a method call eat the first param since it's just self.
if has_self { if has_self {
commas = commas + 1; commas += 1;
} }
current_parameter = Some(commas); current_parameter = Some(commas);

View file

@ -58,7 +58,7 @@ pub fn join_lines(file: &File, range: TextRange) -> LocalEdit {
pub fn on_enter(file: &File, offset: TextUnit) -> Option<LocalEdit> { pub fn on_enter(file: &File, offset: TextUnit) -> Option<LocalEdit> {
let comment = find_leaf_at_offset(file.syntax(), offset) let comment = find_leaf_at_offset(file.syntax(), offset)
.left_biased() .left_biased()
.and_then(|it| ast::Comment::cast(it))?; .and_then(ast::Comment::cast)?;
if let ast::CommentFlavor::Multiline = comment.flavor() { if let ast::CommentFlavor::Multiline = comment.flavor() {
return None; return None;

View file

@ -18,7 +18,7 @@ fn main() -> Result<()> {
.directory("log") .directory("log")
.start()?; .start()?;
info!("lifecycle: server started"); info!("lifecycle: server started");
match ::std::panic::catch_unwind(|| main_inner()) { match ::std::panic::catch_unwind(main_inner) {
Ok(res) => { Ok(res) => {
info!("lifecycle: terminating process with {:?}", res); info!("lifecycle: terminating process with {:?}", res);
res res

View file

@ -289,8 +289,8 @@ pub fn handle_runnables(
.filter_map(|ws| { .filter_map(|ws| {
let tgt = ws.target_by_root(path)?; let tgt = ws.target_by_root(path)?;
Some(( Some((
tgt.package(ws).name(ws).clone(), tgt.package(ws).name(ws),
tgt.name(ws).clone(), tgt.name(ws),
tgt.kind(ws), tgt.kind(ws),
)) ))
}) })

View file

@ -173,7 +173,6 @@ pub fn workspace_loader() -> (Worker<PathBuf, Result<CargoWorkspace>>, ThreadWat
1, 1,
|input_receiver, output_sender| { |input_receiver, output_sender| {
input_receiver input_receiver
.into_iter()
.map(|path| CargoWorkspace::from_cargo_metadata(path.as_path())) .map(|path| CargoWorkspace::from_cargo_metadata(path.as_path()))
.for_each(|it| output_sender.send(it)) .for_each(|it| output_sender.send(it))
}, },

View file

@ -24,7 +24,6 @@ pub fn roots_loader() -> (Worker<PathBuf, (PathBuf, Vec<FileEvent>)>, ThreadWatc
128, 128,
|input_receiver, output_sender| { |input_receiver, output_sender| {
input_receiver input_receiver
.into_iter()
.map(|path| { .map(|path| {
debug!("loading {} ...", path.as_path().display()); debug!("loading {} ...", path.as_path().display());
let events = load_root(path.as_path()); let events = load_root(path.as_path());

View file

@ -31,7 +31,7 @@ impl<'s> Ptr<'s> {
/// For example, 0 will return the current token, 1 will return the next, etc. /// For example, 0 will return the current token, 1 will return the next, etc.
pub fn nth(&self, n: u32) -> Option<char> { pub fn nth(&self, n: u32) -> Option<char> {
let mut chars = self.chars().peekable(); let mut chars = self.chars().peekable();
chars.by_ref().skip(n as usize).next() chars.by_ref().nth(n as usize)
} }
/// Checks whether the current character is `c`. /// Checks whether the current character is `c`.

View file

@ -135,7 +135,7 @@ fn find_reparsable_node(
} }
fn is_balanced(tokens: &[Token]) -> bool { fn is_balanced(tokens: &[Token]) -> bool {
if tokens.len() == 0 if tokens.is_empty()
|| tokens.first().unwrap().kind != L_CURLY || tokens.first().unwrap().kind != L_CURLY
|| tokens.last().unwrap().kind != R_CURLY || tokens.last().unwrap().kind != R_CURLY
{ {

View file

@ -5,7 +5,7 @@ use std::fmt::Write;
/// Parse a file and create a string representation of the resulting parse tree. /// Parse a file and create a string representation of the resulting parse tree.
pub fn dump_tree(syntax: SyntaxNodeRef) -> String { pub fn dump_tree(syntax: SyntaxNodeRef) -> String {
let mut errors: Vec<_> = syntax.root_data().iter().cloned().collect(); let mut errors: Vec<_> = syntax.root_data().to_vec();
errors.sort_by_key(|e| e.offset); errors.sort_by_key(|e| e.offset);
let mut err_pos = 0; let mut err_pos = 0;
let mut level = 0; let mut level = 0;