squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Add a method to test span containment

Browse source
This commit is contained in:
Seo Sanghyeon 2015-09-26 10:44:37 +09:00
parent 5180a7ccc5
commit f3211b1578
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/librustc/middle/check_match.rs
View file

@ -281,11 +281,10 @@ fn check_for_static_nan(cx: &MatchCheckCtxt, pat: &Pat) {
Ok(_) => {}
Err(err) => {
let subspan = p.span.lo <= err.span.lo && err.span.hi <= p.span.hi;
span_err!(cx.tcx.sess, err.span, E0471,
"constant evaluation error: {}",
err.description());
if !subspan {
if !p.span.contains(err.span) {
cx.tcx.sess.span_note(p.span,
"in pattern here")
}

4
src/librustc_typeck/astconv.rs
View file

@ -1692,12 +1692,10 @@ pub fn ast_ty_to_ty<'tcx>(this: &AstConv<'tcx>,
}
}
Err(ref r) => {
let subspan =
ast_ty.span.lo <= r.span.lo && r.span.hi <= ast_ty.span.hi;
span_err!(tcx.sess, r.span, E0250,
"array length constant evaluation error: {}",
r.description());
if !subspan {
if !ast_ty.span.contains(r.span) {
span_note!(tcx.sess, ast_ty.span, "for array length here")
}
this.tcx().types.err

6
src/libsyntax/codemap.rs
View file

@ -142,6 +142,10 @@ impl Span {
pub fn substitute_dummy(self, other: Span) -> Span {
if self == DUMMY_SP { other } else { self }
}
pub fn contains(self, other: Span) -> bool {
self.lo <= other.lo && other.hi <= self.hi
}
}
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
@ -1011,7 +1015,7 @@ impl CodeMap {
let span_comes_from_this_expansion =
info.callee.span.map_or(span == info.call_site, |mac_span| {
mac_span.lo <= span.lo && span.hi <= mac_span.hi
mac_span.contains(span)
});
debug!("span_allows_unstable: span: {:?} call_site: {:?} callee: {:?}",