diff options
| author | bors <bors@rust-lang.org> | 2021-07-09 06:35:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-09 06:35:42 +0000 |
| commit | 95fb1315217976ff4c268bb03c9b4132f0dfa9fd (patch) | |
| tree | 3365b878b561fcc0d6a53b7cff1b28198115bd02 /compiler/rustc_span/src | |
| parent | b090cd1ea6a20d16e467c723fd0dd9f1d0adf812 (diff) | |
| parent | 2083207536e710071475dc489f155c574951e3fd (diff) | |
| download | rust-95fb1315217976ff4c268bb03c9b4132f0dfa9fd.tar.gz rust-95fb1315217976ff4c268bb03c9b4132f0dfa9fd.zip | |
Auto merge of #86904 - m-ou-se:prelude-collision-check-trait, r=nikomatsakis
Check FromIterator trait impl in prelude collision check. Fixes #86902.
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index edb97d70517..5e9a2904b7c 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -155,6 +155,7 @@ symbols! { FormatSpec, Formatter, From, + FromIterator, Future, FxHashMap, FxHashSet, |