language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

migrate analysis and server to 2018

Browse source
This commit is contained in:
Aleksey Kladov 2018-10-15 20:15:53 +03:00
parent 2dd6858d03
commit bb298158eb
21 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_lsp_server/src/conv.rs
View file

@ -7,7 +7,7 @@ use ra_editor::{LineIndex, LineCol, Edit, AtomEdit};
use ra_syntax::{SyntaxKind, TextUnit, TextRange};
use ra_analysis::{FileId, SourceChange, SourceFileEdit, FileSystemEdit};
use {
use crate::{
Result,
server_world::ServerWorld,
req,
@ -299,7 +299,7 @@ pub fn to_location(
Ok(loc)
}
pub trait MapConvWith<'a>: Sized {
pub trait MapConvWith<'a>: Sized + 'a {
type Ctx;
type Output;
@ -309,7 +309,7 @@ pub trait MapConvWith<'a>: Sized {
}
impl<'a, I> MapConvWith<'a> for I
where I: Iterator,
where I: Iterator + 'a,
I::Item: ConvWith
{
type Ctx = <I::Item as ConvWith>::Ctx;