From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- tests/ui/parser/diff-markers/enum-2.rs | 11 +++++++++++ tests/ui/parser/diff-markers/enum-2.stderr | 21 +++++++++++++++++++++ tests/ui/parser/diff-markers/enum.rs | 7 +++++++ tests/ui/parser/diff-markers/enum.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/fn-arg.rs | 16 ++++++++++++++++ tests/ui/parser/diff-markers/fn-arg.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/item-with-attr.rs | 10 ++++++++++ tests/ui/parser/diff-markers/item-with-attr.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/item.rs | 9 +++++++++ tests/ui/parser/diff-markers/item.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/statement.rs | 15 +++++++++++++++ tests/ui/parser/diff-markers/statement.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/struct-expr.rs | 12 ++++++++++++ tests/ui/parser/diff-markers/struct-expr.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/struct.rs | 7 +++++++ tests/ui/parser/diff-markers/struct.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/trait-item.rs | 14 ++++++++++++++ tests/ui/parser/diff-markers/trait-item.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/tuple-struct.rs | 7 +++++++ tests/ui/parser/diff-markers/tuple-struct.stderr | 18 ++++++++++++++++++ tests/ui/parser/diff-markers/use-statement.rs | 9 +++++++++ tests/ui/parser/diff-markers/use-statement.stderr | 18 ++++++++++++++++++ 22 files changed, 318 insertions(+) create mode 100644 tests/ui/parser/diff-markers/enum-2.rs create mode 100644 tests/ui/parser/diff-markers/enum-2.stderr create mode 100644 tests/ui/parser/diff-markers/enum.rs create mode 100644 tests/ui/parser/diff-markers/enum.stderr create mode 100644 tests/ui/parser/diff-markers/fn-arg.rs create mode 100644 tests/ui/parser/diff-markers/fn-arg.stderr create mode 100644 tests/ui/parser/diff-markers/item-with-attr.rs create mode 100644 tests/ui/parser/diff-markers/item-with-attr.stderr create mode 100644 tests/ui/parser/diff-markers/item.rs create mode 100644 tests/ui/parser/diff-markers/item.stderr create mode 100644 tests/ui/parser/diff-markers/statement.rs create mode 100644 tests/ui/parser/diff-markers/statement.stderr create mode 100644 tests/ui/parser/diff-markers/struct-expr.rs create mode 100644 tests/ui/parser/diff-markers/struct-expr.stderr create mode 100644 tests/ui/parser/diff-markers/struct.rs create mode 100644 tests/ui/parser/diff-markers/struct.stderr create mode 100644 tests/ui/parser/diff-markers/trait-item.rs create mode 100644 tests/ui/parser/diff-markers/trait-item.stderr create mode 100644 tests/ui/parser/diff-markers/tuple-struct.rs create mode 100644 tests/ui/parser/diff-markers/tuple-struct.stderr create mode 100644 tests/ui/parser/diff-markers/use-statement.rs create mode 100644 tests/ui/parser/diff-markers/use-statement.stderr (limited to 'tests/ui/parser/diff-markers') diff --git a/tests/ui/parser/diff-markers/enum-2.rs b/tests/ui/parser/diff-markers/enum-2.rs new file mode 100644 index 000000000..76ea980fc --- /dev/null +++ b/tests/ui/parser/diff-markers/enum-2.rs @@ -0,0 +1,11 @@ +enum E { + Foo { +<<<<<<< HEAD //~ ERROR encountered diff marker + x: u8, +||||||| + z: (), +======= + y: i8, +>>>>>>> branch + } +} diff --git a/tests/ui/parser/diff-markers/enum-2.stderr b/tests/ui/parser/diff-markers/enum-2.stderr new file mode 100644 index 000000000..63da5c2a6 --- /dev/null +++ b/tests/ui/parser/diff-markers/enum-2.stderr @@ -0,0 +1,21 @@ +error: encountered diff marker + --> $DIR/enum-2.rs:3:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | x: u8, +LL | ||||||| + | ------- +LL | z: (), +LL | ======= + | ------- +LL | y: i8, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/enum.rs b/tests/ui/parser/diff-markers/enum.rs new file mode 100644 index 000000000..45df6e325 --- /dev/null +++ b/tests/ui/parser/diff-markers/enum.rs @@ -0,0 +1,7 @@ +enum E { +<<<<<<< HEAD //~ ERROR encountered diff marker + Foo(u8), +======= + Bar(i8), +>>>>>>> branch +} diff --git a/tests/ui/parser/diff-markers/enum.stderr b/tests/ui/parser/diff-markers/enum.stderr new file mode 100644 index 000000000..abbf3fb41 --- /dev/null +++ b/tests/ui/parser/diff-markers/enum.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/enum.rs:2:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | Foo(u8), +LL | ======= + | ------- +LL | Bar(i8), +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/fn-arg.rs b/tests/ui/parser/diff-markers/fn-arg.rs new file mode 100644 index 000000000..86c355628 --- /dev/null +++ b/tests/ui/parser/diff-markers/fn-arg.rs @@ -0,0 +1,16 @@ +trait T { + fn foo( +<<<<<<< HEAD //~ ERROR encountered diff marker + x: u8, +======= + x: i8, +>>>>>>> branch + ) {} +} + +struct S; +impl T for S {} + +fn main() { + S::foo(42); +} diff --git a/tests/ui/parser/diff-markers/fn-arg.stderr b/tests/ui/parser/diff-markers/fn-arg.stderr new file mode 100644 index 000000000..933a20641 --- /dev/null +++ b/tests/ui/parser/diff-markers/fn-arg.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/fn-arg.rs:3:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | x: u8, +LL | ======= + | ------- +LL | x: i8, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/item-with-attr.rs b/tests/ui/parser/diff-markers/item-with-attr.rs new file mode 100644 index 000000000..985907c08 --- /dev/null +++ b/tests/ui/parser/diff-markers/item-with-attr.rs @@ -0,0 +1,10 @@ +#[attribute] +<<<<<<< HEAD //~ ERROR encountered diff marker +fn foo() {} +======= +fn bar() {} +>>>>>>> branch + +fn main() { + foo(); +} diff --git a/tests/ui/parser/diff-markers/item-with-attr.stderr b/tests/ui/parser/diff-markers/item-with-attr.stderr new file mode 100644 index 000000000..850e2368e --- /dev/null +++ b/tests/ui/parser/diff-markers/item-with-attr.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/item-with-attr.rs:2:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | fn foo() {} +LL | ======= + | ------- +LL | fn bar() {} +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/item.rs b/tests/ui/parser/diff-markers/item.rs new file mode 100644 index 000000000..4ed36b7b4 --- /dev/null +++ b/tests/ui/parser/diff-markers/item.rs @@ -0,0 +1,9 @@ +<<<<<<< HEAD //~ ERROR encountered diff marker +fn foo() {} +======= +fn bar() {} +>>>>>>> branch + +fn main() { + foo(); +} diff --git a/tests/ui/parser/diff-markers/item.stderr b/tests/ui/parser/diff-markers/item.stderr new file mode 100644 index 000000000..9ab3631a6 --- /dev/null +++ b/tests/ui/parser/diff-markers/item.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/item.rs:1:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | fn foo() {} +LL | ======= + | ------- +LL | fn bar() {} +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/statement.rs b/tests/ui/parser/diff-markers/statement.rs new file mode 100644 index 000000000..e55d16d3b --- /dev/null +++ b/tests/ui/parser/diff-markers/statement.rs @@ -0,0 +1,15 @@ +trait T { + fn foo() {} + fn bar() {} +} + +struct S; +impl T for S {} + +fn main() { +<<<<<<< HEAD //~ ERROR encountered diff marker + S::foo(); +======= + S::bar(); +>>>>>>> branch +} diff --git a/tests/ui/parser/diff-markers/statement.stderr b/tests/ui/parser/diff-markers/statement.stderr new file mode 100644 index 000000000..7ca2495b8 --- /dev/null +++ b/tests/ui/parser/diff-markers/statement.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/statement.rs:10:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | S::foo(); +LL | ======= + | ------- +LL | S::bar(); +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/struct-expr.rs b/tests/ui/parser/diff-markers/struct-expr.rs new file mode 100644 index 000000000..99d2fd662 --- /dev/null +++ b/tests/ui/parser/diff-markers/struct-expr.rs @@ -0,0 +1,12 @@ +struct S { + x: u8, +} +fn main() { + let _ = S { +<<<<<<< HEAD //~ ERROR encountered diff marker + x: 42, +======= + x: 0, +>>>>>>> branch + } +} diff --git a/tests/ui/parser/diff-markers/struct-expr.stderr b/tests/ui/parser/diff-markers/struct-expr.stderr new file mode 100644 index 000000000..d70476a98 --- /dev/null +++ b/tests/ui/parser/diff-markers/struct-expr.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/struct-expr.rs:6:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | x: 42, +LL | ======= + | ------- +LL | x: 0, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/struct.rs b/tests/ui/parser/diff-markers/struct.rs new file mode 100644 index 000000000..d26464d47 --- /dev/null +++ b/tests/ui/parser/diff-markers/struct.rs @@ -0,0 +1,7 @@ +struct S { +<<<<<<< HEAD //~ ERROR encountered diff marker + x: u8, +======= + x: i8, +>>>>>>> branch +} diff --git a/tests/ui/parser/diff-markers/struct.stderr b/tests/ui/parser/diff-markers/struct.stderr new file mode 100644 index 000000000..cc0b3da66 --- /dev/null +++ b/tests/ui/parser/diff-markers/struct.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/struct.rs:2:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | x: u8, +LL | ======= + | ------- +LL | x: i8, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/trait-item.rs b/tests/ui/parser/diff-markers/trait-item.rs new file mode 100644 index 000000000..3227c8212 --- /dev/null +++ b/tests/ui/parser/diff-markers/trait-item.rs @@ -0,0 +1,14 @@ +trait T { +<<<<<<< HEAD //~ ERROR encountered diff marker + fn foo() {} +======= + fn bar() {} +>>>>>>> branch +} + +struct S; +impl T for S {} + +fn main() { + S::foo(); +} diff --git a/tests/ui/parser/diff-markers/trait-item.stderr b/tests/ui/parser/diff-markers/trait-item.stderr new file mode 100644 index 000000000..cdc19f8e0 --- /dev/null +++ b/tests/ui/parser/diff-markers/trait-item.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/trait-item.rs:2:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | fn foo() {} +LL | ======= + | ------- +LL | fn bar() {} +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/tuple-struct.rs b/tests/ui/parser/diff-markers/tuple-struct.rs new file mode 100644 index 000000000..7eec35c96 --- /dev/null +++ b/tests/ui/parser/diff-markers/tuple-struct.rs @@ -0,0 +1,7 @@ +struct S( +<<<<<<< HEAD //~ ERROR encountered diff marker + u8, +======= + i8, +>>>>>>> branch +); diff --git a/tests/ui/parser/diff-markers/tuple-struct.stderr b/tests/ui/parser/diff-markers/tuple-struct.stderr new file mode 100644 index 000000000..d673db898 --- /dev/null +++ b/tests/ui/parser/diff-markers/tuple-struct.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/tuple-struct.rs:2:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | u8, +LL | ======= + | ------- +LL | i8, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + diff --git a/tests/ui/parser/diff-markers/use-statement.rs b/tests/ui/parser/diff-markers/use-statement.rs new file mode 100644 index 000000000..6306243a5 --- /dev/null +++ b/tests/ui/parser/diff-markers/use-statement.rs @@ -0,0 +1,9 @@ +use foo::{ +<<<<<<< HEAD //~ ERROR encountered diff marker + bar, +======= + baz, +>>>>>>> branch +}; + +fn main() {} diff --git a/tests/ui/parser/diff-markers/use-statement.stderr b/tests/ui/parser/diff-markers/use-statement.stderr new file mode 100644 index 000000000..12e6f57dd --- /dev/null +++ b/tests/ui/parser/diff-markers/use-statement.stderr @@ -0,0 +1,18 @@ +error: encountered diff marker + --> $DIR/use-statement.rs:2:1 + | +LL | <<<<<<< HEAD + | ^^^^^^^ after this is the code before the merge +LL | bar, +LL | ======= + | ------- +LL | baz, +LL | >>>>>>> branch + | ^^^^^^^ above this are the incoming code changes + | + = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code + = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased + = note: for an explanation on these markers from the `git` documentation, visit + +error: aborting due to previous error + -- cgit v1.2.3