bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Keep spans for generics in #[derive(_)] desugaring

Browse source 
Keep the spans for generics coming from a `derive`d Item, so that errors
and suggestions have better detail.

Fix #84003.
This commit is contained in:
Esteban Kuber 2021-11-03 04:19:06 +00:00
parent e5038e2099
commit e70105f971
10 changed files with 312 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_hir/src/hir.rs
View file

@ -17,8 +17,7 @@ use rustc_index::vec::IndexVec;
use rustc_macros::HashStable_Generic;
use rustc_span::source_map::Spanned;
use rustc_span::symbol::{kw, sym, Ident, Symbol};
use rustc_span::{def_id::LocalDefId, BytePos};
use rustc_span::{MultiSpan, Span, DUMMY_SP};
use rustc_span::{def_id::LocalDefId, BytePos, MultiSpan, Span, DUMMY_SP};
use rustc_target::asm::InlineAsmRegOrRegClass;
use rustc_target::spec::abi::Abi;
@ -529,7 +528,6 @@ impl GenericParam<'hir> {
pub fn bounds_span(&self) -> Option<Span> {
self.bounds.iter().fold(None, |span, bound| {
let span = span.map(|s| s.to(bound.span())).unwrap_or_else(|| bound.span());
Some(span)
})
}