mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #51291 - evincarofautumn:master, r=oli-obk

Browse Source 
Fix typos of ‘ambiguous’

I had trouble finding this code because of the typo after it was [referenced in a tweet](https://twitter.com/bstrie/status/1002751044605153280). Also fixes an identical but unrelated typo in a comment.
This commit is contained in:
Mark Simulacrum 2018-06-02 13:14:27 -06:00 committed by GitHub
commit d297f68603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc/traits/project.rs
View File

@ -146,7 +146,7 @@ impl<'tcx> ProjectionTyCandidateSet<'tcx> {
// was not used). On other paths, it is not assigned, // was not used). On other paths, it is not assigned,
// and hence if those paths *could* reach the code that // and hence if those paths *could* reach the code that
// comes after the match, this fn would not compile. // comes after the match, this fn would not compile.
let convert_to_ambigious; let convert_to_ambiguous;
match self { match self {
None => { None => {
@ -169,10 +169,10 @@ impl<'tcx> ProjectionTyCandidateSet<'tcx> {
// clauses are the safer choice. See the comment on // clauses are the safer choice. See the comment on
// `select::SelectionCandidate` and #21974 for more details. // `select::SelectionCandidate` and #21974 for more details.
match (current, candidate) { match (current, candidate) {
(ParamEnv(..), ParamEnv(..)) => convert_to_ambigious = (), (ParamEnv(..), ParamEnv(..)) => convert_to_ambiguous = (),
(ParamEnv(..), _) => return false, (ParamEnv(..), _) => return false,
(_, ParamEnv(..)) => { unreachable!(); } (_, ParamEnv(..)) => { unreachable!(); }
(_, _) => convert_to_ambigious = (), (_, _) => convert_to_ambiguous = (),
} }
} }
@ -183,7 +183,7 @@ impl<'tcx> ProjectionTyCandidateSet<'tcx> {
// We only ever get here when we moved from a single candidate // We only ever get here when we moved from a single candidate
// to ambiguous. // to ambiguous.
let () = convert_to_ambigious; let () = convert_to_ambiguous;
*self = Ambiguous; *self = Ambiguous;
false false
} }

2
src/librustc/traits/query/normalize.rs
View File

@ -33,7 +33,7 @@ impl<'cx, 'gcx, 'tcx> At<'cx, 'gcx, 'tcx> {
/// normalized. If you don't care about regions, you should prefer /// normalized. If you don't care about regions, you should prefer
/// `normalize_erasing_regions`, which is more efficient. /// `normalize_erasing_regions`, which is more efficient.
/// ///
/// If the normalization succeeds and is unambigious, returns back /// If the normalization succeeds and is unambiguous, returns back
/// the normalized value along with various outlives relations (in /// the normalized value along with various outlives relations (in
/// the form of obligations that must be discharged). /// the form of obligations that must be discharged).
/// ///