nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-14 09:36:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1088 from sinkuu/issue_1086

Browse Source 
Fix formatting empty block comments (`/**/`)
This commit is contained in:
Nick Cameron 2016-07-11 10:24:53 +12:00 committed by GitHub
commit ca2debdcb1
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/comment.rs
View File

@ -33,7 +33,7 @@ pub fn rewrite_comment(orig: &str,
if block_style {
("/* ", " */", " * ")
} else if !config.normalize_comments {
if orig.starts_with("/**") {
if orig.starts_with("/**") && !orig.starts_with("/**/") {
("/** ", " **/", " ** ")
} else if orig.starts_with("/*!") {
("/*! ", " */", " * ")
@ -46,7 +46,8 @@ pub fn rewrite_comment(orig: &str,
} else {
("// ", "", "// ")
}
} else if orig.starts_with("///") || orig.starts_with("/**") {
} else if orig.starts_with("///") ||
(orig.starts_with("/**") && !orig.starts_with("/**/")) {
("/// ", "", "/// ")
} else if orig.starts_with("//!") || orig.starts_with("/*!") {
("//! ", "", "//! ")
@ -130,7 +131,7 @@ fn left_trim_comment_line(line: &str) -> &str {
} else if line.starts_with("/* ") || line.starts_with("// ") || line.starts_with("//!") ||
line.starts_with("///") ||
line.starts_with("** ") || line.starts_with("/*!") ||
line.starts_with("/**") {
(line.starts_with("/**") && !line.starts_with("/**/")) {
&line[3..]
} else if line.starts_with("/*") || line.starts_with("* ") || line.starts_with("//") ||
line.starts_with("**") {
@ -606,7 +607,8 @@ fn remove_comment_header(comment: &str) -> &str {
&comment[3..]
} else if comment.starts_with("//") {
&comment[2..]
} else if comment.starts_with("/**") || comment.starts_with("/*!") {
} else if (comment.starts_with("/**") && !comment.starts_with("/**/")) ||
comment.starts_with("/*!") {
&comment[3..comment.len() - 2]
} else {
assert!(comment.starts_with("/*"),

4
tests/source/comment.rs
View File

@ -43,6 +43,10 @@ fn chains() {
/* comment */ x })
}
fn issue_1086() {
/**/
}
/*
* random comment */

4
tests/target/comment.rs
View File

@ -45,6 +45,10 @@ fn chains() {
})
}
fn issue_1086() {
//
}
// random comment
fn main() {