rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move deprecated attribute to where it is needed

Browse Source
This commit is contained in:
kjeremy
2020-07-22 15:41:38 -04:00
parent 9a9c0e1105
commit 7eedf19cfa
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/rust-analyzer/src/handlers.rs
View File

@@ -2,8 +2,6 @@
//! Protocol. The majority of requests are fulfilled by calling into the //! Protocol. The majority of requests are fulfilled by calling into the
//! `ra_ide` crate. //! `ra_ide` crate.
#![allow(deprecated)]
use std::{ use std::{
io::Write as _, io::Write as _,
process::{self, Stdio}, process::{self, Stdio},
@@ -260,6 +258,7 @@ pub(crate) fn handle_document_symbol(
tags.push(SymbolTag::Deprecated) tags.push(SymbolTag::Deprecated)
}; };
#[allow(deprecated)]
let doc_symbol = DocumentSymbol { let doc_symbol = DocumentSymbol {
name: symbol.label, name: symbol.label,
detail: symbol.detail, detail: symbol.detail,
@@ -305,11 +304,14 @@ pub(crate) fn handle_document_symbol(
res: &mut Vec<SymbolInformation>, res: &mut Vec<SymbolInformation>,
) { ) {
let mut tags = Vec::new(); let mut tags = Vec::new();
#[allow(deprecated)]
match symbol.deprecated { match symbol.deprecated {
Some(true) => tags.push(SymbolTag::Deprecated), Some(true) => tags.push(SymbolTag::Deprecated),
_ => {} _ => {}
} }
#[allow(deprecated)]
res.push(SymbolInformation { res.push(SymbolInformation {
name: symbol.name.clone(), name: symbol.name.clone(),
kind: symbol.kind, kind: symbol.kind,
@@ -357,6 +359,8 @@ pub(crate) fn handle_workspace_symbol(
let mut res = Vec::new(); let mut res = Vec::new();
for nav in snap.analysis.symbol_search(query)? { for nav in snap.analysis.symbol_search(query)? {
let container_name = nav.container_name.as_ref().map(|v| v.to_string()); let container_name = nav.container_name.as_ref().map(|v| v.to_string());
#[allow(deprecated)]
let info = SymbolInformation { let info = SymbolInformation {
name: nav.name.to_string(), name: nav.name.to_string(),
kind: to_proto::symbol_kind(nav.kind), kind: to_proto::symbol_kind(nav.kind),