Skip to content

Commit 32098bb

Browse files
committed
auto merge of #16440 : bheesham/rust/master, r=brson
* `rust.md`: changes for consistency * `guide-ffi.md`: wrapped inline code NOTE: This is a duplicate of #16375. I completely messed up that fork, so I made a new fork.
2 parents 259e806 + a43dadb commit 32098bb

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/doc/guide-ffi.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ linking to, and in the second case `bar` is the type of native library that the
350350
compiler is linking to. There are currently three known types of native
351351
libraries:
352352
353-
* Dynamic - `#[link(name = "readline")]
354-
* Static - `#[link(name = "my_build_dependency", kind = "static")]
355-
* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]
353+
* Dynamic - `#[link(name = "readline")]`
354+
* Static - `#[link(name = "my_build_dependency", kind = "static")]`
355+
* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]`
356356
357357
Note that frameworks are only available on OSX targets.
358358

src/doc/rust.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ The `ident` production is any nonempty Unicode string of the following form:
135135

136136
that does _not_ occur in the set of [keywords](#keywords).
137137

138-
Note: `XID_start` and `XID_continue` as character properties cover the
139-
character ranges used to form the more familiar C and Java language-family
140-
identifiers.
138+
> **Note**: `XID_start` and `XID_continue` as character properties cover the
139+
> character ranges used to form the more familiar C and Java language-family
140+
> identifiers.
141141
142142
### Delimiter-restricted productions
143143

@@ -933,9 +933,9 @@ Usually a `use` declaration is used to shorten the path required to refer to a
933933
module item. These declarations may appear at the top of [modules](#modules) and
934934
[blocks](#blocks).
935935

936-
*Note*: Unlike in many languages,
937-
`use` declarations in Rust do *not* declare linkage dependency with external crates.
938-
Rather, [`extern crate` declarations](#extern-crate-declarations) declare linkage dependencies.
936+
> **Note**: Unlike in many languages,
937+
> `use` declarations in Rust do *not* declare linkage dependency with external crates.
938+
> Rather, [`extern crate` declarations](#extern-crate-declarations) declare linkage dependencies.
939939
940940
Use declarations support a number of convenient shortcuts:
941941

@@ -2573,8 +2573,8 @@ within a statement block is simply a way of restricting its scope to a narrow
25732573
region containing all of its uses; it is otherwise identical in meaning to
25742574
declaring the item outside the statement block.
25752575

2576-
Note: there is no implicit capture of the function's dynamic environment when
2577-
declaring a function-local item.
2576+
> **Note**: there is no implicit capture of the function's dynamic environment when
2577+
> declaring a function-local item.
25782578
25792579
#### Slot declarations
25802580

0 commit comments

Comments
 (0)