Merge pull request rust-lang#3555 from rchaser53/issue-3554

fix `Const generics are handled incorrectly`

Author: scampi

src/items.rs

@@ -664,7 +664,6 @@ pub(crate) fn format_impl(
     context: &RewriteContext<'_>,
     item: &ast::Item,
     offset: Indent,
-    where_span_end: Option<BytePos>,
 ) -> Option<String> {
     if let ast::ItemKind::Impl(_, _, _, ref generics, _, ref self_ty, ref items) = item.node {
         let mut result = String::with_capacity(128);
@@ -691,6 +690,8 @@ pub(crate) fn format_impl(
             option.compress_where();
         }
 
+        let misssing_span = mk_sp(self_ty.span.hi(), item.span.hi());
+        let where_span_end = context.snippet_provider.opt_span_before(misssing_span, "{");
         let where_clause_str = rewrite_where_clause(
             context,
             &generics.where_clause,

src/visitor.rs

@@ -5,7 +5,7 @@ use syntax::source_map::{self, BytePos, Pos, SourceMap, Span};
 use syntax::{ast, visit};
 
 use crate::attr::*;
-use crate::comment::{CodeCharKind, CommentCodeSlices, FindUncommented};
+use crate::comment::{CodeCharKind, CommentCodeSlices};
 use crate::config::file_lines::FileName;
 use crate::config::{BraceStyle, Config, Version};
 use crate::expr::{format_expr, ExprType};
@@ -359,13 +359,8 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
             match item.node {
                 ast::ItemKind::Use(ref tree) => self.format_import(item, tree),
                 ast::ItemKind::Impl(..) => {
-                    let snippet = self.snippet(item.span);
-                    let where_span_end = snippet
-                        .find_uncommented("{")
-                        .map(|x| BytePos(x as u32) + source!(self, item.span).lo());
                     let block_indent = self.block_indent;
-                    let rw = self
-                        .with_context(|ctx| format_impl(&ctx, item, block_indent, where_span_end));
+                    let rw = self.with_context(|ctx| format_impl(&ctx, item, block_indent));
                     self.push_rewrite(item.span, rw);
                 }
                 ast::ItemKind::Trait(..) => {

tests/target/issue-3554.rs

@@ -0,0 +1,4 @@
+#![feature(const_generics)]
+
+pub struct S<const N: usize>;
+impl S<{ 0 }> {}