diff options
| author | bors <bors@rust-lang.org> | 2014-12-10 20:11:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-12-10 20:11:27 +0000 |
| commit | c38e73fef53e8520e5170c40713e32ab965a8abe (patch) | |
| tree | 2b1dbfc717e73bdffb0b9a21d37f2c54219ea1df | |
| parent | bc486dc233b23f79d5f144cbbbd67cde208c14b6 (diff) | |
| parent | 65bca024a7f6f7c3b40d8c9315657f2639262939 (diff) | |
| download | rust-c38e73fef53e8520e5170c40713e32ab965a8abe.tar.gz rust-c38e73fef53e8520e5170c40713e32ab965a8abe.zip | |
auto merge of #19705 : brson/rust/fix-install, r=alexcrichton
| -rw-r--r-- | mk/dist.mk | 1 | ||||
| -rw-r--r-- | src/librand/chacha.rs | 2 | ||||
| -rw-r--r-- | src/librustc/metadata/loader.rs | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 0b9cd86c61f..00f6e861739 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -48,7 +48,6 @@ PKG_FILES := \ $(S)configure $(S)Makefile.in \ $(S)man \ $(addprefix $(S)src/, \ - README.md \ compiletest \ doc \ driver \ diff --git a/src/librand/chacha.rs b/src/librand/chacha.rs index ad5884c16c5..5cbc5a0a61c 100644 --- a/src/librand/chacha.rs +++ b/src/librand/chacha.rs @@ -117,7 +117,7 @@ impl ChaChaRng { /// security proof for a more involved example of this. /// /// The modified word layout is: - /// ```ignore + /// ```text /// constant constant constant constant /// key key key key /// key key key key diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs index 77c0a8abe64..e364bd8e752 100644 --- a/src/librustc/metadata/loader.rs +++ b/src/librustc/metadata/loader.rs @@ -120,7 +120,7 @@ //! //! The compiler accepts a flag of this form a number of times: //! -//! ```ignore +//! ```text //! --extern crate-name=path/to/the/crate.rlib //! ``` //! @@ -152,7 +152,7 @@ //! //! and the compiler would be invoked as: //! -//! ```ignore +//! ```text //! rustc a.rs --extern b1=path/to/libb1.rlib --extern b2=path/to/libb2.rlib //! ``` //! @@ -178,7 +178,7 @@ //! dependencies, not the upstream transitive dependencies. Consider this //! dependency graph: //! -//! ```ignore +//! ```text //! A.1 A.2 //! | | //! | | |