diff options
| author | bors <bors@rust-lang.org> | 2019-07-07 04:42:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-07 04:42:58 +0000 |
| commit | 927a3e873d92d6e85a18d6274becf2fb8d4f284c (patch) | |
| tree | 762ea874f8031397e78295c8115450be23273300 /src/test | |
| parent | 4393768faa104b9879c601feee71eb0207dc4fe1 (diff) | |
| parent | fb0117000a89053ab8e964eb5fee1d73a5d019c1 (diff) | |
| download | rust-927a3e873d92d6e85a18d6274becf2fb8d4f284c.tar.gz rust-927a3e873d92d6e85a18d6274becf2fb8d4f284c.zip | |
Auto merge of #62458 - Centril:rollup-j6o2sqj, r=Centril
Rollup of 4 pull requests Successful merges: - #61990 (First question mark in doctest) - #62379 (Add missing links in Option documentation) - #62438 (rustbuild: Cleanup global lint settings) - #62455 (name the trait in ambiguous-associated-items fully qualified suggestion) Failed merges: r? @ghost
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr index f0dd689934f..ef025e0e146 100644 --- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr +++ b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr @@ -2,7 +2,7 @@ error: ambiguous associated item --> $DIR/enum-variant-priority-lint-ambiguous_associated_items.rs:32:15 | LL | fn f() -> Self::V { 0 } - | ^^^^^^^ help: use fully-qualified syntax: `<E as Trait>::V` + | ^^^^^^^ help: use fully-qualified syntax: `<E as Tr>::V` | = note: #[deny(ambiguous_associated_items)] on by default = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! |