Skip to content

Rollup of 12 pull requests #72187

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
May 14, 2020
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
079817d
Make `prefix` immutable
ldm0 Apr 25, 2020
c9f1162
Rephrase the any::type_name docs a bit.
ltratt May 4, 2020
93f877c
Document that lifetimes do not currently appear in any::type_name()'s…
ltratt May 4, 2020
876001c
Fix typo.
ltratt May 4, 2020
5cb2fa4
Document From trait for Option implementations
Dolpheyn May 4, 2020
73f07a4
Fix comment position
Dolpheyn May 5, 2020
2badd41
Fix example
Dolpheyn May 5, 2020
d80ac64
Fix link to `map` documentation in example
Dolpheyn May 10, 2020
41f6b95
Remove ty::UnnormalizedProjection
jackh726 May 12, 2020
3fccdb3
Pointer printing: do not print 0 offset
RalfJung May 1, 2020
61fbe57
Clean up E0581 explanation
GuillaumeGomez May 12, 2020
5063297
Add doc comment for `rustc_middle::mir::mono::Linkage`
wesleywiser May 12, 2020
34b2072
Fix bootstrap failing on win32
jcotton42 May 7, 2020
003ed80
Map to -> return.
ltratt May 12, 2020
722b3df
Update books
ehuss May 12, 2020
bb2ff59
Clean up E0582 explanation
GuillaumeGomez May 13, 2020
46e9cbe
Update src/libcore/option.rs
Dolpheyn May 13, 2020
4588c26
Update src/libcore/option.rs
Dolpheyn May 13, 2020
a9e7d57
Update src/libcore/option.rs
Dolpheyn May 13, 2020
644bb24
Update src/libcore/option.rs
Dolpheyn May 13, 2020
adc2bf0
Update src/libcore/option.rs
Dolpheyn May 13, 2020
f445a82
Update src/libcore/option.rs
Dolpheyn May 13, 2020
ef1688d
Update src/libcore/option.rs
Dolpheyn May 13, 2020
6c3856f
Update src/libcore/option.rs
Dolpheyn May 13, 2020
e44f87f
docs: fix link
tshepang May 13, 2020
dab3a58
Fix Arc::decr_strong_count doc test
tmiasko May 14, 2020
32ea6a1
Rollup merge of #71525 - ldm0:intosug, r=Mark-Simulacrum
RalfJung May 14, 2020
7893d9a
Rollup merge of #71741 - RalfJung:pointer-print, r=oli-obk
RalfJung May 14, 2020
720ec68
Rollup merge of #71870 - ltratt:more_specific_type_name_doc, r=kennytm
RalfJung May 14, 2020
a6c1f61
Rollup merge of #71909 - Dolpheyn:doc-from-trait-for-option, r=stevek…
RalfJung May 14, 2020
577da45
Rollup merge of #71964 - jcotton42:bootstrap_decode_none_windows, r=M…
RalfJung May 14, 2020
0b8b38c
Rollup merge of #72137 - GuillaumeGomez:cleanup-e0581, r=Dylan-DPC
RalfJung May 14, 2020
18d7c34
Rollup merge of #72138 - wesleywiser:add_doc_comment, r=matthewjasper
RalfJung May 14, 2020
e5f31e0
Rollup merge of #72150 - jackh726:unnorm_projection, r=nikomatsakis
RalfJung May 14, 2020
39f91b1
Rollup merge of #72151 - ehuss:update-books, r=ehuss
RalfJung May 14, 2020
71f460b
Rollup merge of #72163 - tshepang:nonexistent-link, r=matthewjasper
RalfJung May 14, 2020
864eae7
Rollup merge of #72169 - GuillaumeGomez:cleanup-e0582, r=Dylan-DPC
RalfJung May 14, 2020
56986be
Rollup merge of #72183 - tmiasko:decr-strong-count, r=Mark-Simulacrum
RalfJung May 14, 2020
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
Update src/libcore/option.rs
Co-authored-by: Steve Klabnik <[email protected]>
  • Loading branch information
Dolpheyn and steveklabnik authored May 13, 2020
commit 6c3856f3ec5bbcd1c748d01a463f04a8fef0bd6c
2 changes: 2 additions & 0 deletions src/libcore/option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1389,7 +1389,9 @@ impl<'a, T> From<&'a Option<T>> for Option<&'a T> {
/// ```
/// let s: Option<String> = Some(String::from("Hello, Rustaceans!"));
/// let o: Option<usize> = Option::from(&s).map(|ss: &String| ss.len());
///
/// println!("Can still print s: {:?}", s);
///
/// assert_eq!(o, Some(18));
/// ```
fn from(o: &'a Option<T>) -> Option<&'a T> {
Expand Down