diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-10-22 00:14:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-22 00:14:00 +0200 |
| commit | 7ee0aeacaffb3dc259a9e93a752345cf6ce35a1e (patch) | |
| tree | c642f846e3acf8dfc6a7764d538fed33f7b25660 /src/test | |
| parent | e67f09ac799e4a6e4e90147d62c94c9ddcc94197 (diff) | |
| parent | 62a2a1d257e6776bcd669ca5dd7a2c7a30017ce2 (diff) | |
| download | rust-7ee0aeacaffb3dc259a9e93a752345cf6ce35a1e.tar.gz rust-7ee0aeacaffb3dc259a9e93a752345cf6ce35a1e.zip | |
Rollup merge of #103339 - Rageking8:fix-some-typos, r=fee1-dead
Fix some typos
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/generic-associated-types/bugs/issue-91762.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/let-else/let-else-non-diverging.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs (renamed from src/test/ui/traits/trait-upcasting/multiple-occurence-ambiguousity.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr (renamed from src/test/ui/traits/trait-upcasting/multiple-occurence-ambiguousity.stderr) | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/generic-associated-types/bugs/issue-91762.rs b/src/test/ui/generic-associated-types/bugs/issue-91762.rs index 796935cc06f..dec668bec10 100644 --- a/src/test/ui/generic-associated-types/bugs/issue-91762.rs +++ b/src/test/ui/generic-associated-types/bugs/issue-91762.rs @@ -1,7 +1,7 @@ // check-fail // known-bug -// We almost certaintly want this to pass, but +// We almost certainly want this to pass, but // it's particularly difficult currently, because we need a way of specifying // that `<Self::Base as Functor>::With<T> = Self` without using that when we have // a `U`. See `https://github.com/rust-lang/rust/pull/92728` for a (hacky) diff --git a/src/test/ui/let-else/let-else-non-diverging.rs b/src/test/ui/let-else/let-else-non-diverging.rs index 58d2c09776f..a5442dd82f0 100644 --- a/src/test/ui/let-else/let-else-non-diverging.rs +++ b/src/test/ui/let-else/let-else-non-diverging.rs @@ -11,7 +11,7 @@ fn main() { // Ensure that uninhabited types do not "diverge". // This might be relaxed in the future, but when it is, - // it should be an explicitly wanted descision. + // it should be an explicitly wanted decision. let Some(x) = Some(1) else { foo::<Uninhabited>() }; //~ ERROR does not diverge } diff --git a/src/test/ui/traits/trait-upcasting/multiple-occurence-ambiguousity.rs b/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs index 6986ad62172..6986ad62172 100644 --- a/src/test/ui/traits/trait-upcasting/multiple-occurence-ambiguousity.rs +++ b/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.rs diff --git a/src/test/ui/traits/trait-upcasting/multiple-occurence-ambiguousity.stderr b/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr index e9670ad7def..9564813512c 100644 --- a/src/test/ui/traits/trait-upcasting/multiple-occurence-ambiguousity.stderr +++ b/src/test/ui/traits/trait-upcasting/multiple-occurrence-ambiguousity.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/multiple-occurence-ambiguousity.rs:21:26 + --> $DIR/multiple-occurrence-ambiguousity.rs:21:26 | LL | let t: &dyn Bar<_> = s; | ----------- ^ expected trait `Bar`, found trait `Foo` |