Auto merge of #25123 - arielb1:self-inhibiting-error, r=nikomatsakis

author bors <bors@rust-lang.org>

Thu, 7 May 2015 23:40:55 +0000 (23:40 +0000)

committer bors <bors@rust-lang.org>

Thu, 7 May 2015 23:40:55 +0000 (23:40 +0000)
author bors <bors@rust-lang.org>
Thu, 7 May 2015 23:40:55 +0000 (23:40 +0000)
committer bors <bors@rust-lang.org>
Thu, 7 May 2015 23:40:55 +0000 (23:40 +0000)
diff --cc src/librustc/middle/traits/error_reporting.rs
Simple merge
author	bors <bors@rust-lang.org>
	Thu, 7 May 2015 23:40:55 +0000 (23:40 +0000)
committer	bors <bors@rust-lang.org>
	Thu, 7 May 2015 23:40:55 +0000 (23:40 +0000)