|
11 | 11 | //! Finds crate binaries and loads their metadata |
12 | 12 | //! |
13 | 13 | //! Might I be the first to welcome you to a world of platform differences, |
14 | | -//! version requirements, dependency graphs, conficting desires, and fun! This |
| 14 | +//! version requirements, dependency graphs, conflicting desires, and fun! This |
15 | 15 | //! is the major guts (along with metadata::creader) of the compiler for loading |
16 | 16 | //! crates and resolving dependencies. Let's take a tour! |
17 | 17 | //! |
|
83 | 83 | //! 5. Does the target in the metadata agree with the current target? |
84 | 84 | //! 6. Does the SVH match? (more on this later) |
85 | 85 | //! |
86 | | -//! If the file answeres `yes` to all these questions, then the file is |
| 86 | +//! If the file answers `yes` to all these questions, then the file is |
87 | 87 | //! considered as being *candidate* for being accepted. It is illegal to have |
88 | 88 | //! more than two candidates as the compiler has no method by which to resolve |
89 | 89 | //! this conflict. Additionally, rlib/dylib candidates are considered |
|
173 | 173 | //! ## Loading transitive dependencies |
174 | 174 | //! |
175 | 175 | //! Dealing with same-named-but-distinct crates is not just a local problem, but |
176 | | -//! one that also needs to be dealt with for transitive dependences. Note that |
| 176 | +//! one that also needs to be dealt with for transitive dependencies. Note that |
177 | 177 | //! in the letter above `--extern` flags only apply to the *local* set of |
178 | 178 | //! dependencies, not the upstream transitive dependencies. Consider this |
179 | 179 | //! dependency graph: |
@@ -660,7 +660,7 @@ impl<'a> Context<'a> { |
660 | 660 | false |
661 | 661 | }); |
662 | 662 |
|
663 | | - // Now that we have an itertor of good candidates, make sure there's at |
| 663 | + // Now that we have an iterator of good candidates, make sure there's at |
664 | 664 | // most one rlib and at most one dylib. |
665 | 665 | let mut rlibs = HashSet::new(); |
666 | 666 | let mut dylibs = HashSet::new(); |
|
0 commit comments