diff options
| author | bors <bors@rust-lang.org> | 2021-04-07 15:33:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-07 15:33:46 +0000 |
| commit | e9cdcccfa8321363999a43ee30a18b3aadbc20de (patch) | |
| tree | b9649646765b2d3c8d0a6d6595fdd5efa1cc9b03 /src/test/ui/error-codes/e0119/complex-impl.stderr | |
| parent | b01026de465d5a5ef51e32c1012c43927d2a111c (diff) | |
| parent | d82419b4062d69a197d543a17367f254d1b4fcff (diff) | |
Auto merge of #83964 - Dylan-DPC:rollup-9kinaiv, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #83476 (Add strong_count mutation methods to Rc) - #83634 (Do not emit the advanced diagnostics on macros) - #83816 (Trigger `unused_doc_comments` on macros at once) - #83916 (Use AnonConst for asm! constants) - #83935 (forbid `impl Trait` in generic param defaults) - #83936 (Disable using non-ascii identifiers in extern blocks.) - #83945 (Add suggestion to reborrow mutable references when they're moved in a for loop) - #83954 (Do not ICE when closure is involved in Trait Alias Impl Trait) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/ui/error-codes/e0119/complex-impl.stderr')
| -rw-r--r-- | src/test/ui/error-codes/e0119/complex-impl.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/error-codes/e0119/complex-impl.stderr b/src/test/ui/error-codes/e0119/complex-impl.stderr index d617d812924..04babb06447 100644 --- a/src/test/ui/error-codes/e0119/complex-impl.stderr +++ b/src/test/ui/error-codes/e0119/complex-impl.stderr @@ -1,4 +1,4 @@ -error[E0119]: conflicting implementations of trait `complex_impl_support::External` for type `(Q, complex_impl_support::M<'_, '_, '_, std::boxed::Box<_>, _, _>)`: +error[E0119]: conflicting implementations of trait `complex_impl_support::External` for type `(Q, complex_impl_support::M<'_, '_, '_, std::boxed::Box<_>, _, _>)` --> $DIR/complex-impl.rs:9:1 | LL | impl<R> External for (Q, R) {} |