Skip to content

Commit

Permalink
Merge pull request #667 from ehuss/fix-links
Browse files Browse the repository at this point in the history
Fix some links.
  • Loading branch information
Havvy authored Aug 31, 2019
2 parents 372c7f9 + 997f761 commit abe11b6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/items/functions.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ extern "Rust" fn foo() {}
```

Functions in Rust can be called by foreign code, and using an ABI that
differs from Rust allows, for example, to provide functions that can be
differs from Rust allows, for example, to provide functions that can be
called from other programming languages like C:

```rust
Expand All @@ -156,7 +156,7 @@ extern "C" fn new_i32() -> i32 { 0 }
extern "stdcall" fn new_i32_stdcall() -> i32 { 0 }
```

Just as with [external block], when the `extern` keyword is used and the `"ABI`
Just as with [external block], when the `extern` keyword is used and the `"ABI`
is omitted, the ABI used defaults to `"C"`. That is, this:

```rust
Expand Down Expand Up @@ -306,7 +306,7 @@ async fn safe_example() {
// An `unsafe` block is required to invoke the function initially:
let p = 22;
let future = unsafe { unsafe_example(&p) };
// But no `unsafe` block required here. This will
// read the value of `p`:
let q = future.await;
Expand Down Expand Up @@ -360,7 +360,7 @@ attributes macros.
[_Type_]: ../types.md#type-expressions
[_WhereClause_]: generics.md#where-clauses
[const context]: ../const_eval.md#const-context
[external blocks]: external-blocks.md
[external block]: external-blocks.md
[path]: ../paths.md
[block]: ../expressions/block-expr.md
[variables]: ../variables.md
Expand Down
4 changes: 2 additions & 2 deletions src/items/use-declarations.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ fn main() {}
> use ::foo::baz::foobaz;
> ```
>
> The 2015 edition does not allow use declarations to reference the [extern
> prelude]. Thus [`extern crate`] declarations are still required in 2015 to
> The 2015 edition does not allow use declarations to reference the [extern prelude].
> Thus [`extern crate`] declarations are still required in 2015 to
> reference an external crate in a use declaration. Beginning with the 2018
> edition, use declarations can specify an external crate dependency the same
> way `extern crate` can.
Expand Down

0 comments on commit abe11b6

Please sign in to comment.