diff options
| author | jam1garner <8260240+jam1garner@users.noreply.github.com> | 2021-05-26 23:27:24 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2021-06-14 13:27:24 -0400 |
| commit | c341d5b9d7ebf0f2a2000de81fe236ae2f3445b0 (patch) | |
| tree | 2409e015eb5740d8855f8e2195a9f0d3909712c6 | |
| parent | 1626e1938ab6378c2b44891a1e4bd73c3f96719c (diff) | |
| download | rust-c341d5b9d7ebf0f2a2000de81fe236ae2f3445b0.tar.gz rust-c341d5b9d7ebf0f2a2000de81fe236ae2f3445b0.zip | |
Improve documentation for `future_prelude_collision` lint
| -rw-r--r-- | compiler/rustc_lint_defs/src/builtin.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs index 168ea713d19..cfa7c160b0f 100644 --- a/compiler/rustc_lint_defs/src/builtin.rs +++ b/compiler/rustc_lint_defs/src/builtin.rs @@ -3275,9 +3275,10 @@ declare_lint! { /// ### Explanation /// /// In Rust 2021, one of the important introductions is the [prelude changes], which add - /// `TryFrom` and `TryInto` into the standard library's prelude. Since this results in an - /// amiguity as to which method to call when an existing `try_from` or `try_into` method is - /// called via dot-call syntax. + /// `TryFrom`, `TryInto`, and `FromIterator` into the standard library's prelude. Since this + /// results in an amiguity as to which method/function to call when an existing `try_into` + /// method is called via dot-call syntax or a `try_from`/`from_iter` associated function + /// is called directly on a type. /// /// [prelude changes]: https://blog.rust-lang.org/inside-rust/2021/03/04/planning-rust-2021.html#prelude-changes pub FUTURE_PRELUDE_COLLISION, |