mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve: Simplify fn report_privacy_error

Browse Source 
by factoring out `fn ctor_fields_span` into a separate function
This commit is contained in:
Vadim Petrochenkov 2020-03-07 18:39:16 +03:00
parent c20d7eecbc
commit 71ebc61820
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/librustc_resolve/diagnostics.rs
View File

@ -916,51 +916,46 @@ impl<'a> Resolver<'a> {
err.emit(); err.emit();
} }
crate fn report_privacy_error(&self, privacy_error: &PrivacyError<'_>) { /// If the binding refers to a tuple struct constructor with fields,
let PrivacyError { ident, binding, .. } = *privacy_error; /// returns the span of its fields.
let session = &self.session; fn ctor_fields_span(&self, binding: &NameBinding<'_>) -> Option<Span> {
let mk_struct_span_error = |is_constructor| { if let NameBindingKind::Res(
let mut descr = binding.res().descr().to_string();
if is_constructor {
descr += " constructor";
}
if binding.is_import() {
descr += " import";
}
let mut err =
struct_span_err!(session, ident.span, E0603, "{} `{}` is private", descr, ident);
err.span_label(ident.span, &format!("this {} is private", descr));
err.span_note(
session.source_map().def_span(binding.span),
&format!("the {} `{}` is defined here", descr, ident),
);
err
};
let mut err = if let NameBindingKind::Res(
Res::Def(DefKind::Ctor(CtorOf::Struct, CtorKind::Fn), ctor_def_id), Res::Def(DefKind::Ctor(CtorOf::Struct, CtorKind::Fn), ctor_def_id),
_, _,
) = binding.kind ) = binding.kind
{ {
let def_id = (&*self).parent(ctor_def_id).expect("no parent for a constructor"); let def_id = (&*self).parent(ctor_def_id).expect("no parent for a constructor");
if let Some(fields) = self.field_names.get(&def_id) { if let Some(fields) = self.field_names.get(&def_id) {
let mut err = mk_struct_span_error(true);
let first_field = fields.first().expect("empty field list in the map"); let first_field = fields.first().expect("empty field list in the map");
err.span_label( return Some(fields.iter().fold(first_field.span, |acc, field| acc.to(field.span)));
fields.iter().fold(first_field.span, |acc, field| acc.to(field.span)),
"a constructor is private if any of the fields is private",
);
err
} else {
mk_struct_span_error(false)
} }
} else { }
mk_struct_span_error(false) None
}; }
crate fn report_privacy_error(&self, privacy_error: &PrivacyError<'_>) {
let PrivacyError { ident, binding, .. } = *privacy_error;
let ctor_fields_span = self.ctor_fields_span(binding);
let mut descr = binding.res().descr().to_string();
if ctor_fields_span.is_some() {
descr += " constructor";
}
if binding.is_import() {
descr += " import";
}
let mut err =
struct_span_err!(self.session, ident.span, E0603, "{} `{}` is private", descr, ident);
err.span_label(ident.span, &format!("this {} is private", descr));
if let Some(span) = ctor_fields_span {
err.span_label(span, "a constructor is private if any of the fields is private");
}
err.span_note(
self.session.source_map().def_span(binding.span),
&format!("the {} `{}` is defined here", descr, ident),
);
err.emit(); err.emit();
} }
} }