auto merge of #19705 : brson/rust/fix-install, r=alexcrichton

This commit is contained in:
bors 2014-12-10 20:11:27 +00:00
commit c38e73fef5
3 changed files with 4 additions and 5 deletions

View file

@ -48,7 +48,6 @@ PKG_FILES := \
$(S)configure $(S)Makefile.in \
$(S)man \
$(addprefix $(S)src/, \
README.md \
compiletest \
doc \
driver \

View file

@ -117,7 +117,7 @@ pub fn set_counter(&mut self, counter_low: u64, counter_high: u64) {
/// 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

View file

@ -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
//! | |
//! | |