remove clones

This commit is contained in:
Aleksey Kladov 2018-10-15 22:36:08 +03:00
parent bbcd998433
commit 85ff328d31
4 changed files with 5 additions and 6 deletions

View File

@ -162,7 +162,7 @@ impl Query {
} }
} }
#[derive(Clone, Debug)] #[derive(Debug)]
pub struct Analysis { pub struct Analysis {
imp: AnalysisImpl imp: AnalysisImpl
} }

View File

@ -478,7 +478,7 @@ pub fn handle_code_action(
} }
pub fn publish_diagnostics( pub fn publish_diagnostics(
world: ServerWorld, world: &ServerWorld,
file_id: FileId, file_id: FileId,
) -> Result<req::PublishDiagnosticsParams> { ) -> Result<req::PublishDiagnosticsParams> {
let uri = world.file_id_to_uri(file_id)?; let uri = world.file_id_to_uri(file_id)?;
@ -497,7 +497,7 @@ pub fn publish_diagnostics(
} }
pub fn publish_decorations( pub fn publish_decorations(
world: ServerWorld, world: &ServerWorld,
file_id: FileId, file_id: FileId,
) -> Result<req::PublishDecorationsParams> { ) -> Result<req::PublishDecorationsParams> {
let uri = world.file_id_to_uri(file_id)?; let uri = world.file_id_to_uri(file_id)?;

View File

@ -391,7 +391,7 @@ fn update_file_notifications_on_threadpool(
) { ) {
pool.spawn(move || { pool.spawn(move || {
for file_id in subscriptions { for file_id in subscriptions {
match handlers::publish_diagnostics(world.clone(), file_id) { match handlers::publish_diagnostics(&world, file_id) {
Err(e) => { Err(e) => {
error!("failed to compute diagnostics: {:?}", e) error!("failed to compute diagnostics: {:?}", e)
} }
@ -400,7 +400,7 @@ fn update_file_notifications_on_threadpool(
sender.send(Task::Notify(not)); sender.send(Task::Notify(not));
} }
} }
match handlers::publish_decorations(world.clone(), file_id) { match handlers::publish_decorations(&world, file_id) {
Err(e) => { Err(e) => {
error!("failed to compute decorations: {:?}", e) error!("failed to compute decorations: {:?}", e)
} }

View File

@ -23,7 +23,6 @@ pub struct ServerWorldState {
pub mem_map: FxHashMap<FileId, Option<String>>, pub mem_map: FxHashMap<FileId, Option<String>>,
} }
#[derive(Clone)]
pub struct ServerWorld { pub struct ServerWorld {
pub workspaces: Arc<Vec<CargoWorkspace>>, pub workspaces: Arc<Vec<CargoWorkspace>>,
pub analysis: Analysis, pub analysis: Analysis,