mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #88875 - notriddle:notriddle/cleanup-unused-trait-selection, r=Mark-Simulacrum

Browse source 
cleanup(rustc_trait_selection): remove vestigial code from rustc_on_unimplemented

This isn't allowed by the validator, and seems to be unused.
When it was added in ed10a3faae,
it was used on `Sized`, and that usage is gone.
This commit is contained in:
Manish Goregaokar 2021-09-16 10:57:19 -07:00 • committed by GitHub
commit b66c9c3ac1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_span/src/symbol.rs
View file

@ -934,7 +934,6 @@ symbols! {
panic_unwind, panic_unwind,
panicking, panicking,
param_attrs, param_attrs,
parent_trait,
partial_cmp, partial_cmp,
partial_ord, partial_ord,
passes, passes,

3
compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs
View file

@ -154,9 +154,6 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
flags.push((sym::from_method, Some(method.to_string()))); flags.push((sym::from_method, Some(method.to_string())));
} }
} }
if let Some((t, _)) = self.get_parent_trait_ref(&obligation.cause.code) {
flags.push((sym::parent_trait, Some(t)));
}
if let Some(k) = obligation.cause.span.desugaring_kind() { if let Some(k) = obligation.cause.span.desugaring_kind() {
flags.push((sym::from_desugaring, None)); flags.push((sym::from_desugaring, None));