Skip to content

Commit c38e73f

Browse files
committed
auto merge of #19705 : brson/rust/fix-install, r=alexcrichton
2 parents bc486dc + 65bca02 commit c38e73f

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

mk/dist.mk

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ PKG_FILES := \
4848
$(S)configure $(S)Makefile.in \
4949
$(S)man \
5050
$(addprefix $(S)src/, \
51-
README.md \
5251
compiletest \
5352
doc \
5453
driver \

src/librand/chacha.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl ChaChaRng {
117117
/// security proof for a more involved example of this.
118118
///
119119
/// The modified word layout is:
120-
/// ```ignore
120+
/// ```text
121121
/// constant constant constant constant
122122
/// key key key key
123123
/// key key key key

src/librustc/metadata/loader.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
//!
121121
//! The compiler accepts a flag of this form a number of times:
122122
//!
123-
//! ```ignore
123+
//! ```text
124124
//! --extern crate-name=path/to/the/crate.rlib
125125
//! ```
126126
//!
@@ -152,7 +152,7 @@
152152
//!
153153
//! and the compiler would be invoked as:
154154
//!
155-
//! ```ignore
155+
//! ```text
156156
//! rustc a.rs --extern b1=path/to/libb1.rlib --extern b2=path/to/libb2.rlib
157157
//! ```
158158
//!
@@ -178,7 +178,7 @@
178178
//! dependencies, not the upstream transitive dependencies. Consider this
179179
//! dependency graph:
180180
//!
181-
//! ```ignore
181+
//! ```text
182182
//! A.1 A.2
183183
//! | |
184184
//! | |

0 commit comments

Comments
 (0)