Skip to content

Commit

Permalink
Rollup merge of rust-lang#61776 - JohnTitor:fix-typo-in-error-codes, …
Browse files Browse the repository at this point in the history
…r=Centril

Fix typos in error_codes

`observedin` should be `observed in`.
  • Loading branch information
Centril authored Jun 12, 2019
2 parents 3272e6e + b8f1491 commit af281d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/librustc/error_codes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1883,7 +1883,7 @@ This pattern should be rewritten. There are a few possible ways to do this:
# }
```
The same applies to transmutes to `*mut fn()`, which were observedin practice.
The same applies to transmutes to `*mut fn()`, which were observed in practice.
Note though that use of this type is generally incorrect.
The intention is typically to describe a function pointer, but just `fn()`
alone suffices for that. `*mut fn()` is a pointer to a fn pointer.
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/explain.stdout
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ This pattern should be rewritten. There are a few possible ways to do this:
let f: extern "C" fn(*mut i32) = transmute(foo as usize); // works too
```

The same applies to transmutes to `*mut fn()`, which were observedin practice.
The same applies to transmutes to `*mut fn()`, which were observed in practice.
Note though that use of this type is generally incorrect.
The intention is typically to describe a function pointer, but just `fn()`
alone suffices for that. `*mut fn()` is a pointer to a fn pointer.
Expand Down

0 comments on commit af281d2

Please sign in to comment.