Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Return the first span from Span::join

Browse source
This commit is contained in:
Jonas Schievink 2022-03-23 15:09:39 +01:00
parent 83b4329c6f
commit 1e2a4c1bdb
5 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/proc_macro_srv/src/abis/abi_1_47/rustc_server.rs
View file

@ -662,8 +662,9 @@ impl server::Span for Rustc {
// FIXME handle span
LineColumn { line: 0, column: 0 }
}
fn join(&mut self, _first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
None
fn join(&mut self, first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
// Just return the first span again, because some macros will unwrap the result.
Some(first)
}
fn resolved_at(&mut self, _span: Self::Span, _at: Self::Span) -> Self::Span {
// FIXME handle span

5
crates/proc_macro_srv/src/abis/abi_1_54/rustc_server.rs
View file

@ -665,8 +665,9 @@ impl server::Span for Rustc {
// FIXME handle span
LineColumn { line: 0, column: 0 }
}
fn join(&mut self, _first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
None
fn join(&mut self, first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
// Just return the first span again, because some macros will unwrap the result.
Some(first)
}
fn resolved_at(&mut self, _span: Self::Span, _at: Self::Span) -> Self::Span {
// FIXME handle span

5
crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs
View file

@ -677,8 +677,9 @@ impl server::Span for Rustc {
// FIXME handle span
LineColumn { line: 0, column: 0 }
}
fn join(&mut self, _first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
None
fn join(&mut self, first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
// Just return the first span again, because some macros will unwrap the result.
Some(first)
}
fn resolved_at(&mut self, _span: Self::Span, _at: Self::Span) -> Self::Span {
// FIXME handle span

5
crates/proc_macro_srv/src/abis/abi_1_57/rustc_server.rs
View file

@ -677,8 +677,9 @@ impl server::Span for Rustc {
// FIXME handle span
LineColumn { line: 0, column: 0 }
}
fn join(&mut self, _first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
None
fn join(&mut self, first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
// Just return the first span again, because some macros will unwrap the result.
Some(first)
}
fn resolved_at(&mut self, _span: Self::Span, _at: Self::Span) -> Self::Span {
// FIXME handle span

5
crates/proc_macro_srv/src/abis/abi_1_58/rustc_server.rs
View file

@ -681,8 +681,9 @@ impl server::Span for Rustc {
// FIXME handle span
LineColumn { line: 0, column: 0 }
}
fn join(&mut self, _first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
None
fn join(&mut self, first: Self::Span, _second: Self::Span) -> Option<Self::Span> {
// Just return the first span again, because some macros will unwrap the result.
Some(first)
}
fn resolved_at(&mut self, _span: Self::Span, _at: Self::Span) -> Self::Span {
// FIXME handle span