bors 6ad10844db Auto merge of #36585 - jonathandturner:misc_error_touchups, r=nrc ... Add the ability to merge spans to codemap This PR adds the ability to merge Spans. To do so, it builds on the Codemap's ability to verify the locations of spans, namely that following can be verified: * the expn_id of both spans much match * the lhs span needs to end on the same line the rhs span begins * the lhs span must start at or before the rhs span If all of these are met, a new span is returned that is min(lo), max(hi) of the two spans. This PR also removes an older Span merge, as this new functionality subsumes it. r? @nrc		2016-09-21 22:40:51 -07:00
..
Cargo.toml	Address comments and fix travis warning	2016-06-23 08:07:35 -04:00
lib.rs	Auto merge of #36585 - jonathandturner:misc_error_touchups, r=nrc	2016-09-21 22:40:51 -07:00