OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

review comments

Browse Source
This commit is contained in:
Esteban Küber 2020-01-25 14:28:23 -08:00
parent 0eb29d1a44
commit d137b7ac11
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc_typeck/check/wfcheck.rs
View File

@ -176,7 +176,7 @@ pub fn check_trait_item(tcx: TyCtxt<'_>, def_id: DefId) {
hir::TraitItemKind::Method(ref sig, _) => Some(sig),
_ => None,
};
check_bare_self_trait_by_name(tcx, &trait_item);
check_object_unsafe_self_trait_by_name(tcx, &trait_item);
check_associated_item(tcx, trait_item.hir_id, trait_item.span, method_sig);
}
@ -195,7 +195,7 @@ fn could_be_self(trait_name: Ident, ty: &hir::Ty<'_>) -> bool {
/// Detect when an object unsafe trait is referring to itself in one of its associated items.
/// When this is done, suggest using `Self` instead.
fn check_bare_self_trait_by_name(tcx: TyCtxt<'_>, item: &hir::TraitItem<'_>) {
fn check_object_unsafe_self_trait_by_name(tcx: TyCtxt<'_>, item: &hir::TraitItem<'_>) {
let (trait_name, trait_def_id) = match tcx.hir().get(tcx.hir().get_parent_item(item.hir_id)) {
hir::Node::Item(item) => match item.kind {
hir::ItemKind::Trait(..) => (item.ident, tcx.hir().local_def_id(item.hir_id)),
@ -230,17 +230,18 @@ fn check_bare_self_trait_by_name(tcx: TyCtxt<'_>, item: &hir::TraitItem<'_>) {
return;
}
let sugg = trait_should_be_self.iter().map(|span| (*span, "Self".to_string())).collect();
let mut err = tcx.sess.struct_span_err(
tcx.sess
.struct_span_err(
trait_should_be_self,
"associated item referring to unboxed trait object for its own trait",
);
err.span_label(trait_name.span, "in this trait");
err.multipart_suggestion(
"you might have meant to use `Self` to refer to the materialized type",
)
.span_label(trait_name.span, "in this trait")
.multipart_suggestion(
"you might have meant to use `Self` to refer to the implementing type",
sugg,
Applicability::MachineApplicable,
);
err.emit();
)
.emit();
}
}

4
src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr
View File

@ -6,7 +6,7 @@ LL | trait A: Sized {
LL | fn f(a: A) -> A;
| ^ ^
|
help: you might have meant to use `Self` to refer to the materialized type
help: you might have meant to use `Self` to refer to the implementing type
|
LL | fn f(a: Self) -> Self;
| ^^^^ ^^^^
@ -29,7 +29,7 @@ LL | trait B {
LL | fn f(a: B) -> B;
| ^ ^
|
help: you might have meant to use `Self` to refer to the materialized type
help: you might have meant to use `Self` to refer to the implementing type
|
LL | fn f(a: Self) -> Self;
| ^^^^ ^^^^