Skip to content

Add more tests for comments in lists #5104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2021
Merged

Add more tests for comments in lists #5104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions ...ssue-4909/wrap-comments-not-normalized.rs → ...-in-lists/wrap-comments-not-normalized.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// rustfmt-wrap_comments: true

// https://github.com/rust-lang/rustfmt/issues/4909
pub enum E {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Expand Down Expand Up @@ -105,4 +106,24 @@ fn main() {
2,
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
];

// https://github.com/rust-lang/rustfmt/issues/4430
match a {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

match a {
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
}
}
21 changes: 21 additions & 0 deletions ...s/source/issue-4909/wrap-comments-true.rs → ...e/comments-in-lists/wrap-comments-true.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true

// https://github.com/rust-lang/rustfmt/issues/4909
pub enum E {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Expand Down Expand Up @@ -106,4 +107,24 @@ fn main() {
2,
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
];

// https://github.com/rust-lang/rustfmt/issues/4430
match a {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

match a {
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage through the inclusion pipeline, or according to the descriptions
}
}
96 changes: 96 additions & 0 deletions tests/target/comments-in-lists/format-doc-comments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
// rustfmt-format_code_in_doc_comments: true

// https://github.com/rust-lang/rustfmt/issues/4420
enum Minimal {
Example,
//[thisisremoved thatsleft
// canbeanything
}

struct Minimal2 {
Example: usize,
//[thisisremoved thatsleft
// canbeanything
}

pub enum E {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Variant1,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Variant2,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

pub enum E2 {
// This can be changed once https://github.com/rust-lang/rustfmt/issues/4854 is fixed
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

pub struct S {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
some_field: usize,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
last_field: usize,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

pub struct S2 {
// This can be changed once https://github.com/rust-lang/rustfmt/issues/4854 is fixed
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

fn foo(
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
a: usize,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b: usize,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
) -> usize {
5
}

fn foo2(// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
) -> usize {
5
}

fn main() {
let v = vec![
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
1,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
2,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
];

let v2: Vec<i32> = vec![
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
];

match a {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}
}
13 changes: 13 additions & 0 deletions .../target/issue-4909/wrap-comments-false.rs → .../comments-in-lists/wrap-comments-false.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// rustfmt-normalize_comments: true

// https://github.com/rust-lang/rustfmt/issues/4909
pub enum E {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Expand Down Expand Up @@ -69,4 +70,16 @@ fn main() {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
];

// https://github.com/rust-lang/rustfmt/issues/4430
match a {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}
}
24 changes: 24 additions & 0 deletions ...ssue-4909/wrap-comments-not-normalized.rs → ...-in-lists/wrap-comments-not-normalized.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// rustfmt-wrap_comments: true

// https://github.com/rust-lang/rustfmt/issues/4909
pub enum E {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Expand Down Expand Up @@ -115,4 +116,27 @@ fn main() {
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
];

// https://github.com/rust-lang/rustfmt/issues/4430
match a {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

match a {
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
}
}
24 changes: 24 additions & 0 deletions ...s/target/issue-4909/wrap-comments-true.rs → ...t/comments-in-lists/wrap-comments-true.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true

// https://github.com/rust-lang/rustfmt/issues/4909
pub enum E {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
Expand Down Expand Up @@ -116,4 +117,27 @@ fn main() {
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
];

// https://github.com/rust-lang/rustfmt/issues/4430
match a {
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage
// through the inclusion pipeline, or according to the descriptions
}

match a {
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
b => c,
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
d => e,
// Expand as needed, numbers should be ascending according to the stage through the
// inclusion pipeline, or according to the descriptions
}
}