mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-10 12:18:49 +00:00
Merge from rustc
This commit is contained in:
commit
2e92d36c36
2 changed files with 4 additions and 4 deletions
|
@ -72,7 +72,7 @@ impl server::FreeFunctions for RaSpanServer {
|
||||||
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
|
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
|
||||||
// FIXME: keep track of LitKind and Suffix
|
// FIXME: keep track of LitKind and Suffix
|
||||||
Ok(bridge::Literal {
|
Ok(bridge::Literal {
|
||||||
kind: bridge::LitKind::Err,
|
kind: bridge::LitKind::Integer, // dummy
|
||||||
symbol: Symbol::intern(self.interner, s),
|
symbol: Symbol::intern(self.interner, s),
|
||||||
suffix: None,
|
suffix: None,
|
||||||
span: self.call_site,
|
span: self.call_site,
|
||||||
|
@ -202,7 +202,7 @@ impl server::TokenStream for RaSpanServer {
|
||||||
tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
|
tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
|
||||||
bridge::TokenTree::Literal(bridge::Literal {
|
bridge::TokenTree::Literal(bridge::Literal {
|
||||||
// FIXME: handle literal kinds
|
// FIXME: handle literal kinds
|
||||||
kind: bridge::LitKind::Err,
|
kind: bridge::LitKind::Integer, // dummy
|
||||||
symbol: Symbol::intern(self.interner, &lit.text),
|
symbol: Symbol::intern(self.interner, &lit.text),
|
||||||
// FIXME: handle suffixes
|
// FIXME: handle suffixes
|
||||||
suffix: None,
|
suffix: None,
|
||||||
|
|
|
@ -64,7 +64,7 @@ impl server::FreeFunctions for TokenIdServer {
|
||||||
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
|
) -> Result<bridge::Literal<Self::Span, Self::Symbol>, ()> {
|
||||||
// FIXME: keep track of LitKind and Suffix
|
// FIXME: keep track of LitKind and Suffix
|
||||||
Ok(bridge::Literal {
|
Ok(bridge::Literal {
|
||||||
kind: bridge::LitKind::Err,
|
kind: bridge::LitKind::Integer, // dummy
|
||||||
symbol: Symbol::intern(self.interner, s),
|
symbol: Symbol::intern(self.interner, s),
|
||||||
suffix: None,
|
suffix: None,
|
||||||
span: self.call_site,
|
span: self.call_site,
|
||||||
|
@ -187,7 +187,7 @@ impl server::TokenStream for TokenIdServer {
|
||||||
tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
|
tt::TokenTree::Leaf(tt::Leaf::Literal(lit)) => {
|
||||||
bridge::TokenTree::Literal(bridge::Literal {
|
bridge::TokenTree::Literal(bridge::Literal {
|
||||||
// FIXME: handle literal kinds
|
// FIXME: handle literal kinds
|
||||||
kind: bridge::LitKind::Err,
|
kind: bridge::LitKind::Integer, // dummy
|
||||||
symbol: Symbol::intern(self.interner, &lit.text),
|
symbol: Symbol::intern(self.interner, &lit.text),
|
||||||
// FIXME: handle suffixes
|
// FIXME: handle suffixes
|
||||||
suffix: None,
|
suffix: None,
|
||||||
|
|
Loading…
Reference in a new issue