1
Fork 0

Rename ShowSpanVisitor::span_diagnostic as ShowSpanVisitor::dcx.

This commit is contained in:
Nicholas Nethercote 2023-12-18 08:39:31 +11:00
parent 5ad7144d1b
commit dea752e53d

View file

@ -31,37 +31,37 @@ impl FromStr for Mode {
} }
struct ShowSpanVisitor<'a> { struct ShowSpanVisitor<'a> {
span_diagnostic: &'a rustc_errors::DiagCtxt, dcx: &'a rustc_errors::DiagCtxt,
mode: Mode, mode: Mode,
} }
impl<'a> Visitor<'a> for ShowSpanVisitor<'a> { impl<'a> Visitor<'a> for ShowSpanVisitor<'a> {
fn visit_expr(&mut self, e: &'a ast::Expr) { fn visit_expr(&mut self, e: &'a ast::Expr) {
if let Mode::Expression = self.mode { if let Mode::Expression = self.mode {
self.span_diagnostic.emit_warning(errors::ShowSpan { span: e.span, msg: "expression" }); self.dcx.emit_warning(errors::ShowSpan { span: e.span, msg: "expression" });
} }
visit::walk_expr(self, e); visit::walk_expr(self, e);
} }
fn visit_pat(&mut self, p: &'a ast::Pat) { fn visit_pat(&mut self, p: &'a ast::Pat) {
if let Mode::Pattern = self.mode { if let Mode::Pattern = self.mode {
self.span_diagnostic.emit_warning(errors::ShowSpan { span: p.span, msg: "pattern" }); self.dcx.emit_warning(errors::ShowSpan { span: p.span, msg: "pattern" });
} }
visit::walk_pat(self, p); visit::walk_pat(self, p);
} }
fn visit_ty(&mut self, t: &'a ast::Ty) { fn visit_ty(&mut self, t: &'a ast::Ty) {
if let Mode::Type = self.mode { if let Mode::Type = self.mode {
self.span_diagnostic.emit_warning(errors::ShowSpan { span: t.span, msg: "type" }); self.dcx.emit_warning(errors::ShowSpan { span: t.span, msg: "type" });
} }
visit::walk_ty(self, t); visit::walk_ty(self, t);
} }
} }
pub fn run(span_diagnostic: &rustc_errors::DiagCtxt, mode: &str, krate: &ast::Crate) { pub fn run(dcx: &rustc_errors::DiagCtxt, mode: &str, krate: &ast::Crate) {
let Ok(mode) = mode.parse() else { let Ok(mode) = mode.parse() else {
return; return;
}; };
let mut v = ShowSpanVisitor { span_diagnostic, mode }; let mut v = ShowSpanVisitor { dcx, mode };
visit::walk_crate(&mut v, krate); visit::walk_crate(&mut v, krate);
} }