bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove dead code from print_generic_args.

Browse source
This commit is contained in:
Nicholas Nethercote 2022-08-31 09:08:46 +10:00
parent 49b90573ac
commit ee244bf196
1 changed files with 7 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
compiler/rustc_hir_pretty/src/lib.rs
View file

@ -1189,7 +1189,7 @@ impl<'a> State<'a> {
let generic_args = segment.args(); let generic_args = segment.args();
if !generic_args.args.is_empty() || !generic_args.bindings.is_empty() { if !generic_args.args.is_empty() || !generic_args.bindings.is_empty() {
self.print_generic_args(generic_args, segment.infer_args, true); self.print_generic_args(generic_args, true);
} }
self.print_call_post(base_args) self.print_call_post(base_args)
@ -1592,7 +1592,7 @@ impl<'a> State<'a> {
} }
if segment.ident.name != kw::PathRoot { if segment.ident.name != kw::PathRoot {
self.print_ident(segment.ident); self.print_ident(segment.ident);
self.print_generic_args(segment.args(), segment.infer_args, colons_before_params); self.print_generic_args(segment.args(), colons_before_params);
} }
} }
} }
@ -1600,7 +1600,7 @@ impl<'a> State<'a> {
pub fn print_path_segment(&mut self, segment: &hir::PathSegment<'_>) { pub fn print_path_segment(&mut self, segment: &hir::PathSegment<'_>) {
if segment.ident.name != kw::PathRoot { if segment.ident.name != kw::PathRoot {
self.print_ident(segment.ident); self.print_ident(segment.ident);
self.print_generic_args(segment.args(), segment.infer_args, false); self.print_generic_args(segment.args(), false);
} }
} }
@ -1619,11 +1619,7 @@ impl<'a> State<'a> {
} }
if segment.ident.name != kw::PathRoot { if segment.ident.name != kw::PathRoot {
self.print_ident(segment.ident); self.print_ident(segment.ident);
self.print_generic_args( self.print_generic_args(segment.args(), colons_before_params);
segment.args(),
segment.infer_args,
colons_before_params,
);
} }
} }
@ -1631,11 +1627,7 @@ impl<'a> State<'a> {
self.word("::"); self.word("::");
let item_segment = path.segments.last().unwrap(); let item_segment = path.segments.last().unwrap();
self.print_ident(item_segment.ident); self.print_ident(item_segment.ident);
self.print_generic_args( self.print_generic_args(item_segment.args(), colons_before_params)
item_segment.args(),
item_segment.infer_args,
colons_before_params,
)
} }
hir::QPath::TypeRelative(qself, item_segment) => { hir::QPath::TypeRelative(qself, item_segment) => {
// If we've got a compound-qualified-path, let's push an additional pair of angle // If we've got a compound-qualified-path, let's push an additional pair of angle
@ -1651,11 +1643,7 @@ impl<'a> State<'a> {
self.word("::"); self.word("::");
self.print_ident(item_segment.ident); self.print_ident(item_segment.ident);
self.print_generic_args( self.print_generic_args(item_segment.args(), colons_before_params)
item_segment.args(),
item_segment.infer_args,
colons_before_params,
)
} }
hir::QPath::LangItem(lang_item, span, _) => { hir::QPath::LangItem(lang_item, span, _) => {
self.word("#[lang = \""); self.word("#[lang = \"");
@ -1668,7 +1656,6 @@ impl<'a> State<'a> {
fn print_generic_args( fn print_generic_args(
&mut self, &mut self,
generic_args: &hir::GenericArgs<'_>, generic_args: &hir::GenericArgs<'_>,
infer_args: bool,
colons_before_params: bool, colons_before_params: bool,
) { ) {
if generic_args.parenthesized { if generic_args.parenthesized {
@ -1715,13 +1702,6 @@ impl<'a> State<'a> {
); );
} }
// FIXME(eddyb): this would leak into error messages (e.g.,
// "non-exhaustive patterns: `Some::<..>(_)` not covered").
if infer_args && false {
start_or_comma(self);
self.word("..");
}
for binding in generic_args.bindings { for binding in generic_args.bindings {
start_or_comma(self); start_or_comma(self);
self.print_type_binding(binding); self.print_type_binding(binding);
@ -1735,7 +1715,7 @@ impl<'a> State<'a> {
pub fn print_type_binding(&mut self, binding: &hir::TypeBinding<'_>) { pub fn print_type_binding(&mut self, binding: &hir::TypeBinding<'_>) {
self.print_ident(binding.ident); self.print_ident(binding.ident);
self.print_generic_args(binding.gen_args, false, false); self.print_generic_args(binding.gen_args, false);
self.space(); self.space();
match binding.kind { match binding.kind {
hir::TypeBindingKind::Equality { ref term } => { hir::TypeBindingKind::Equality { ref term } => {