Skip to content

Rollup of 15 pull requests #54146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Sep 12, 2018
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
6ff72a1
AMDGPU call abi info.
DiamondLovesYou Jul 19, 2018
1c0603e
Actually enable the amdgpu component if present.
DiamondLovesYou Jul 19, 2018
bfddede
AMDGPU ignores `noinline` when it slaps `alwaysinline` everywhere.
DiamondLovesYou Jul 19, 2018
66e8e19
Fix an AMDGPU related load bit range metadata assertion.
DiamondLovesYou Jul 19, 2018
b8c6030
Implemented map_or_else for Result<T, E>
ivanbakel Aug 29, 2018
5eb6791
Corrected feature name for map_or_else
ivanbakel Aug 29, 2018
71b16d8
Corrected bad typing in Result::map_or_else doc
ivanbakel Aug 29, 2018
3eda905
Corrected feature status of Result::map_or_else
ivanbakel Aug 29, 2018
6ff4f79
Corrected type variable output T -> U in Result::map_or_else
ivanbakel Aug 29, 2018
79408c3
Added feature attribute to example code in map_or_else doc
ivanbakel Aug 29, 2018
8bbe178
A few cleanups and minor improvements to rustc_passes
ljedrz Sep 7, 2018
aa4f73c
Update documentation for fill_buf in std::io::BufRead
Sep 7, 2018
0ec351d
`&CStr`, not `CStr`, is the counterpart of `&str`
nagisa Sep 8, 2018
597c065
Document .0 to unpack the value from Wrapping
sourcefrog Sep 8, 2018
7f6b608
Stabilization change for mod.rs
blitzerr Sep 9, 2018
7eb0ef0
simplify ordering for Kind
toidiu Sep 9, 2018
88fe8ac
docs: Use dollar sign for all bash prompts
behnam Sep 9, 2018
7acd4b1
Remove documentation about proc_macro being bare-bones
dtolnay Sep 9, 2018
d3e5685
rustdoc: Remove generated blanket impls from trait pages
ollie27 Sep 9, 2018
c549e65
Reexport CheckLintNameResult
flip1995 Sep 10, 2018
abe0f02
fix typos in growth algo description
v-stickykeys Sep 10, 2018
af0f822
Update LLVM to fix GlobalISel dbg.declare
cuviper Sep 11, 2018
8a580ba
Recover proper regression test for issue #16278.
pnkfelix Sep 11, 2018
6b55f04
Rollup merge of #52514 - DiamondLovesYou:amdgpu-fixes, r=eddyb
kennytm Sep 12, 2018
605948f
Rollup merge of #53703 - sourcefrog:doc-wrapping, r=frewsxcv
kennytm Sep 12, 2018
4f62077
Rollup merge of #53777 - ivanbakel:result_map_or_else, r=alexcrichton
kennytm Sep 12, 2018
b365de9
Rollup merge of #54031 - ljedrz:cleanup_passes, r=oli-obk
kennytm Sep 12, 2018
3c9e884
Rollup merge of #54046 - snaedis:issue-48022, r=steveklabnik
kennytm Sep 12, 2018
de2c0f9
Rollup merge of #54064 - nagisa:tiny-typo, r=sfackler
kennytm Sep 12, 2018
e7b45a0
Rollup merge of #54072 - blitzerr:master, r=Mark-Simulacrum
kennytm Sep 12, 2018
61fe064
Rollup merge of #54073 - behnam:docs-1, r=frewsxcv
kennytm Sep 12, 2018
74b8188
Rollup merge of #54074 - toidiu:ak-spimplifyOrd, r=eddyb
kennytm Sep 12, 2018
85b6bf9
Rollup merge of #54085 - dtolnay:bare, r=alexcrichton
kennytm Sep 12, 2018
40d9740
Rollup merge of #54087 - ollie27:rustdoc_blanket_impl, r=QuietMisdreavus
kennytm Sep 12, 2018
2889015
Rollup merge of #54106 - flip1995:pub_checklintnameresult, r=Manishearth
kennytm Sep 12, 2018
13ec061
Rollup merge of #54107 - thevaleriemack:master, r=Mark-Simulacrum
kennytm Sep 12, 2018
ac66146
Rollup merge of #54136 - cuviper:global-isel-dbg.declare, r=alexcrichton
kennytm Sep 12, 2018
1fed251
Rollup merge of #54142 - pnkfelix:fix-regression-test-for-16278, r=we…
kennytm Sep 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Corrected feature name for map_or_else
  • Loading branch information
ivanbakel committed Aug 29, 2018
commit 5eb679105fc4b6827ec64c7cfab12c652a01d6b0
2 changes: 1 addition & 1 deletion src/libcore/result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ impl<T, E> Result<T, E> {
/// assert_eq!(x.map_or_else(|e| k * 2, |v| v.len()), 42);
/// ```
#[inline]
#[stable(feature = "rust1", since = "1.30.0")]
#[stable(feature = "result_map_or_else", since = "1.30.0")]
pub fn map_or_else<U, M: FnOnce(T) -> U, F: FnOnce(E) -> U>(self, fallback: F, map: M) -> U {
self.map(map).unwrap_or_else(fallback)
}
Expand Down