Auto merge of #5937 - ehuss:fix-codemap, r=alexcrichton
Auto merge of #5937 - ehuss:fix-codemap, r=alexcrichton

Fix test failure on nightly due to `codemap::Span` change.

Update due to rust-lang/rust#52953.

nipunn1313/cargo,eminence/cargo,tshepang/cargo,nipunn1313/cargo,vojtechkral/cargo,nipunn1313/cargo,eminence/cargo,nipunn1313/cargo,rust-lang/cargo,tsurai/cargo,tsurai/cargo,rustyhorde/cargo,eminence/cargo,rust-lang/cargo,tshepang/cargo,tshepang/cargo,rust-lang/cargo,rustyhorde/cargo,eminence/cargo,vojtechkral/cargo,tsurai/cargo,tshepang/cargo,rustyhorde/cargo,tsurai/cargo,vojtechkral/cargo,rustyhorde/cargo,vojtechkral/cargo,tsurai/cargo,rust-lang/cargo