Skip to content

Commit

Permalink
auto merge of #19705 : brson/rust/fix-install, r=alexcrichton
Browse files Browse the repository at this point in the history
  • Loading branch information
bors committed Dec 10, 2014
2 parents bc486dc + 65bca02 commit c38e73f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion mk/dist.mk
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ PKG_FILES := \
$(S)configure $(S)Makefile.in \
$(S)man \
$(addprefix $(S)src/, \
README.md \
compiletest \
doc \
driver \
Expand Down
2 changes: 1 addition & 1 deletion src/librand/chacha.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/librustc/metadata/loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
//! ```
//!
Expand Down Expand Up @@ -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
//! ```
//!
Expand All @@ -178,7 +178,7 @@
//! dependencies, not the upstream transitive dependencies. Consider this
//! dependency graph:
//!
//! ```ignore
//! ```text
//! A.1 A.2
//! | |
//! | |
Expand Down

0 comments on commit c38e73f

Please sign in to comment.