then {
// Span containing `.fold(...)`
- let fold_span = fold_args[0].span.next_point().with_hi(fold_args[2].span.hi() + BytePos(1));
+ let next_point = cx.sess().codemap().next_point(fold_args[0].span);
+ let fold_span = next_point.with_hi(fold_args[2].span.hi() + BytePos(1));
let sugg = if replacement_has_args {
format!(
fn suggest_remove_item(&mut self, cx: &T, item: Span, msg: &str) {
let mut remove_span = item;
- let fmpos = cx.sess()
- .codemap()
- .lookup_byte_offset(remove_span.next_point().hi());
+ let hi = cx.sess().codemap().next_point(remove_span).hi();
+ let fmpos = cx.sess().codemap().lookup_byte_offset(hi);
if let Some(ref src) = fmpos.fm.src {
let non_whitespace_offset = src[fmpos.pos.to_usize()..].find(|c| c != ' ' && c != '\t' && c != '\n');