diff options
| author | bors <bors@rust-lang.org> | 2015-02-16 00:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-16 00:46:43 +0000 |
| commit | c5db290bf6df986a6acd5ce993f278c18e55ca37 (patch) | |
| tree | 5a67ed2bb3601bc1d5f477057324421fbd2291c3 /src/libstd/lib.rs | |
| parent | 342ab53bf858a89e418973ba3bfff55161c0b174 (diff) | |
| parent | cea2bbfe27707becaacad1ce64b835b408c0ccf8 (diff) | |
| download | rust-c5db290bf6df986a6acd5ce993f278c18e55ca37.tar.gz rust-c5db290bf6df986a6acd5ce993f278c18e55ca37.zip | |
Auto merge of #22367 - Manishearth:rollup, r=steveklabnik
(still testing locally)
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index e6ca1bfdb81..139693ccdbc 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -279,7 +279,7 @@ pub mod sync; #[path = "sys/common/mod.rs"] mod sys_common; pub mod rt; -mod failure; +mod panicking; // Documentation for primitive types |