diff options
| author | bors <bors@rust-lang.org> | 2014-01-07 17:56:32 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-01-07 17:56:32 -0800 |
| commit | a121f7bab3fe21f03cef6e214d5771bfe669e48c (patch) | |
| tree | aae19d70f56d01d89be7ed95a78b494e9f987e6d /src/rustllvm/RustWrapper.cpp | |
| parent | aa1839bd693176f03f372fb34baa7b19b5030af7 (diff) | |
| parent | 90b394514dad9df9c55b795be724093765d9df3a (diff) | |
| download | rust-a121f7bab3fe21f03cef6e214d5771bfe669e48c.tar.gz rust-a121f7bab3fe21f03cef6e214d5771bfe669e48c.zip | |
auto merge of #10854 : Kimundi/rust/result_compose_map_mutate_or, r=alexcrichton
This implements parts of the changes to `Option` I proposed and discussed in this thread: https://mail.mozilla.org/pipermail/rust-dev/2013-November/006254.html, and on IRC. In short, the string "default" should not be used in any context that has nothing to do with the `std::default::Default` trait. This PR consists of this change: - Renamed `map_default -> map_or` and `mutate_default -> mutate_or_set`.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions