nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-02 11:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix extraction of missing comments when rewriting an empty where clause (#3663)

Browse Source
This commit is contained in:
Stéphane Campinas 2019-06-30 05:19:24 +02:00 committed by Seiichi Uchida
parent b6f7f24915
commit 1f06a8b361
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/comment.rs
View File

@ -859,7 +859,9 @@ pub(crate) fn rewrite_missing_comment(
) -> Option<String> { ) -> Option<String> {
let missing_snippet = context.snippet(span); let missing_snippet = context.snippet(span);
let trimmed_snippet = missing_snippet.trim(); let trimmed_snippet = missing_snippet.trim();
if !trimmed_snippet.is_empty() { // check the span starts with a comment
let pos = trimmed_snippet.find('/');
if !trimmed_snippet.is_empty() && pos.is_some() {
rewrite_comment(trimmed_snippet, false, shape, context.config) rewrite_comment(trimmed_snippet, false, shape, context.config)
} else { } else {
Some(String::new()) Some(String::new())
@ -880,7 +882,7 @@ pub(crate) fn recover_missing_comment_in_span(
Some(String::new()) Some(String::new())
} else { } else {
let missing_snippet = context.snippet(span); let missing_snippet = context.snippet(span);
let pos = missing_snippet.find('/').unwrap_or(0); let pos = missing_snippet.find('/')?;
// 1 = ` ` // 1 = ` `
let total_width = missing_comment.len() + used_width + 1; let total_width = missing_comment.len() + used_width + 1;
let force_new_line_before_comment = let force_new_line_before_comment =

5
tests/source/issue-3639.rs Normal file
View File

@ -0,0 +1,5 @@
trait Foo where {}
struct Bar where {}
struct Bax where;
struct Baz(String) where;
impl<> Foo<> for Bar<> where {}

5
tests/target/issue-3639.rs Normal file
View File

@ -0,0 +1,5 @@
trait Foo {}
struct Bar {}
struct Bax;
struct Baz(String);
impl Foo for Bar {}