Skip to content
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

Document From trait for Option implementations #71909

Merged
merged 12 commits into from
May 14, 2020

Conversation

Dolpheyn
Copy link
Contributor

@Dolpheyn Dolpheyn commented May 4, 2020

Add documentation for From trait for std::option::Option implementations

This PR solves a part of #51430 ( CC @skade )

This is my first PR ever in contributing for OSS. I'm happy to learn and make any changes if necessary :)

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @LukasKalbertodt (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2020
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-8 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/fae70460-ef9f-41fe-8ead-4a8b2b44d001.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/71909/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/71909/merge:refs/remotes/pull/71909/merge
---
 ---> cb2676f08729
Step 5/8 : ENV RUST_CONFIGURE_ARGS       --build=x86_64-unknown-linux-gnu       --llvm-root=/usr/lib/llvm-8       --enable-llvm-link-shared       --set rust.thin-lto-import-instr-limit=10
 ---> Using cache
 ---> df25ce111862
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy &&            python2.7 ../x.py test src/test/mir-opt --pass=build                                   --target=armv5te-unknown-linux-gnueabi &&            python2.7 ../x.py test src/tools/tidy
 ---> 599b9ac96b27
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
 ---> Using cache
 ---> 091087e35a36
---
   Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature)
   Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
   Compiling rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
   Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature)
   Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
   Compiling rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
...................i................................................................................ 1800/9986
.................................................................................................... 1900/9986
....................................i............................................................... 2000/9986
.................................................................................................... 2100/9986
..........................iiiii..................................................................... 2200/9986
.................................................................................................... 2400/9986
.................................................................................................... 2500/9986
.................................................................................................... 2600/9986
.................................................................................................... 2700/9986
---
...............i...............i.................................................................... 5100/9986
.................................................................................................... 5200/9986
.............................................................i...................................... 5300/9986
....................................................i............................................... 5400/9986
........................................................ii.ii........i...i.......................... 5500/9986
.................................................................................................i.. 5600/9986
...i................................................................................................ 5800/9986
.......................................ii.....................................i..................... 5900/9986
.................................................................................................... 6000/9986
.................................................................................................... 6100/9986
.................................................................................................... 6100/9986
...........................................................................ii...i..ii...........i... 6200/9986
.................................................................................................... 6400/9986
.................................................................................................... 6500/9986
.................................................................................................... 6600/9986
.................................................................................................... 6600/9986
.......i..ii........................................................................................ 6700/9986
.................................................................................................... 6900/9986
........i........................................................................................... 7000/9986
.................................................................................................... 7100/9986
..................................................i................................................. 7200/9986
---
.................................................................................................... 7900/9986
.................................................................................................... 8000/9986
.................................................................................................... 8100/9986
..................i................................................................................. 8200/9986
........................................................................iiiiii.iiiii.i.............. 8300/9986
.........................i.......................................................................... 8500/9986
.................................................................................................... 8600/9986
.................................................................................................... 8700/9986
.................................................................................................... 8800/9986
---
Suite("src/test/codegen") not skipped for "bootstrap::test::Codegen" -- not in ["src/tools/tidy"]
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 186 tests
iiii......i.............ii.i..........i.............................i..i..................i....i.... 100/186
........i.i.i...iii..iiiiiiiiiiiiiiii.......................iii...............ii......

 finished in 5.444
Suite("src/test/codegen-units") not skipped for "bootstrap::test::CodegenUnits" -- not in ["src/tools/tidy"]
Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/assembly") not skipped for "bootstrap::test::Assembly" -- not in ["src/tools/tidy"]
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 9 tests
iiiiiiiii

 finished in 0.149
Suite("src/test/incremental") not skipped for "bootstrap::test::Incremental" -- not in ["src/tools/tidy"]
Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/debuginfo") not skipped for "bootstrap::test::Debuginfo" -- not in ["src/tools/tidy"]
Check compiletest suite=debuginfo mode=debuginfo (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 115 tests
iiiii..i.....i..i...i..i.i.i..i..i..ii....i.i....ii..........iiii.........i.....i..i.......ii.i.ii.. 100/115
...iiii.....ii.

 finished in 14.574
Suite("src/test/ui-fulldeps") not skipped for "bootstrap::test::UiFullDeps" -- not in ["src/tools/tidy"]
Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---

   Doc-tests core

running 2504 tests
......iiiii......................................................................................... 100/2504
.......................................................................................ii........... 200/2504
.......................i............................................................................ 400/2504
.............................................................................i..i..................i 500/2504
iii................................................................................................. 600/2504
.................................................................................................... 700/2504
---
---- option.rs - option::Option<&'a T>::from (line 1387) stdout ----
error[E0277]: `std::option::Option<std::string::String>` doesn't implement `std::fmt::Display`
 --> option.rs:1390:35
  |
6 | println!("Can still print s: {}", s);
  |                                   ^ `std::option::Option<std::string::String>` cannot be formatted with the default formatter
  = help: the trait `std::fmt::Display` is not implemented for `std::option::Option<std::string::String>`
  = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
  = note: required by `std::fmt::Display::fmt`
  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
---
  local time: Tue May  5 01:47:33 UTC 2020
  network time: Tue, 05 May 2020 01:47:34 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/71909/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/71909/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (4321) (python)
##[section]Finishing: Finalize Job

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@Dolpheyn
Copy link
Contributor Author

Dolpheyn commented May 5, 2020

r? @steveklabnik

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-8 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/b3a4e04b-0c27-4c86-a49a-b796d82b3c87.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/71909/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/71909/merge:refs/remotes/pull/71909/merge
---
 ---> cb2676f08729
Step 5/8 : ENV RUST_CONFIGURE_ARGS       --build=x86_64-unknown-linux-gnu       --llvm-root=/usr/lib/llvm-8       --enable-llvm-link-shared       --set rust.thin-lto-import-instr-limit=10
 ---> Using cache
 ---> df25ce111862
Step 6/8 : ENV SCRIPT python2.7 ../x.py test --exclude src/tools/tidy &&            python2.7 ../x.py test src/test/mir-opt --pass=build                                   --target=armv5te-unknown-linux-gnueabi &&            python2.7 ../x.py test src/tools/tidy
 ---> 599b9ac96b27
Step 7/8 : ENV NO_DEBUG_ASSERTIONS=1
 ---> Using cache
 ---> 091087e35a36
---
   Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature)
   Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
   Compiling rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
   Compiling rustc_feature v0.0.0 (/checkout/src/librustc_feature)
   Compiling fmt_macros v0.0.0 (/checkout/src/libfmt_macros)
   Compiling rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
   Compiling rustc_hir v0.0.0 (/checkout/src/librustc_hir)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
   Compiling rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
   Compiling rustc_parse v0.0.0 (/checkout/src/librustc_parse)
   Compiling rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
   Compiling rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
...................i................................................................................ 1800/9986
.................................................................................................... 1900/9986
....................................i............................................................... 2000/9986
.................................................................................................... 2100/9986
..........................iiiii..................................................................... 2200/9986
.................................................................................................... 2400/9986
.................................................................................................... 2500/9986
.................................................................................................... 2600/9986
.................................................................................................... 2700/9986
---
...............i...............i.................................................................... 5100/9986
.................................................................................................... 5200/9986
.............................................................i...................................... 5300/9986
....................................................i............................................... 5400/9986
........................................................ii.ii........i...i.......................... 5500/9986
.................................................................................................i.. 5600/9986
...i................................................................................................ 5800/9986
.......................................ii.....................................i..................... 5900/9986
.................................................................................................... 6000/9986
.................................................................................................... 6100/9986
.................................................................................................... 6100/9986
...........................................................................ii...i..ii...........i... 6200/9986
.................................................................................................... 6400/9986
.................................................................................................... 6500/9986
.................................................................................................... 6600/9986
.................................................................................................... 6600/9986
.......i..ii........................................................................................ 6700/9986
.................................................................................................... 6900/9986
........i........................................................................................... 7000/9986
.................................................................................................... 7100/9986
..................................................i................................................. 7200/9986
---
.................................................................................................... 7900/9986
.................................................................................................... 8000/9986
.................................................................................................... 8100/9986
..................i................................................................................. 8200/9986
........................................................................iiiiii.iiiii.i.............. 8300/9986
.........................i.......................................................................... 8500/9986
.................................................................................................... 8600/9986
.................................................................................................... 8700/9986
.................................................................................................... 8800/9986
---
Suite("src/test/codegen") not skipped for "bootstrap::test::Codegen" -- not in ["src/tools/tidy"]
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 186 tests
iiii......i.............ii.i..........i.............................i..i..................i....i.... 100/186
........i.i.i...iii..iiiiiiiiiiiiiiii.......................iii...............ii......

 finished in 4.385
Suite("src/test/codegen-units") not skipped for "bootstrap::test::CodegenUnits" -- not in ["src/tools/tidy"]
Check compiletest suite=codegen-units mode=codegen-units (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/assembly") not skipped for "bootstrap::test::Assembly" -- not in ["src/tools/tidy"]
Check compiletest suite=assembly mode=assembly (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 9 tests
iiiiiiiii

 finished in 0.110
Suite("src/test/incremental") not skipped for "bootstrap::test::Incremental" -- not in ["src/tools/tidy"]
Check compiletest suite=incremental mode=incremental (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---
Suite("src/test/debuginfo") not skipped for "bootstrap::test::Debuginfo" -- not in ["src/tools/tidy"]
Check compiletest suite=debuginfo mode=debuginfo (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)

running 115 tests
iiiii..i.....i..i...i..i.i.i..i..i..ii....i.i....ii..........iiii.........i.....i..i.......ii.i.ii.. 100/115
...iiii.....ii.

 finished in 11.502
Suite("src/test/ui-fulldeps") not skipped for "bootstrap::test::UiFullDeps" -- not in ["src/tools/tidy"]
Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
---

   Doc-tests core

running 2504 tests
......iiiii......................................................................................... 100/2504
.......................................................................................ii........... 200/2504
.......................i............................................................................ 400/2504
.............................................................................i..i..................i 500/2504
iii................................................................................................. 600/2504
.................................................................................................... 700/2504
---

running 1020 tests
i................................................................................................... 100/1020
.................................................................................................... 200/1020
...................iii......i......i...i......i..................................................... 300/1020
.................................................................................................... 400/1020
....................................................i....i......................................ii.. 500/1020
.................................................................................................... 700/1020
.................................................................................................... 700/1020
..............................................iiii.................................................. 800/1020
.................................................................................................... 900/1020
....................................................................iiii............................ 1000/1020
test result: ok. 1000 passed; 0 failed; 20 ignored; 0 measured; 0 filtered out

 finished in 115.437
Set({"src/libterm"}) not skipped for "bootstrap::test::Crate" -- not in ["src/tools/tidy"]
---

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out

 finished in 0.743
Set({"/checkout/src/librustc_query_system"}) not skipped for "bootstrap::test::CrateLibrustc" -- not in ["src/tools/tidy"]
Testing rustc_query_system stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
   Compiling rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
---
Set({"/checkout/src/librustc_parse"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_passes"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_plugin_impl"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_privacy"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_query_system"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_save_analysis"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_session"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_span"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
Set({"/checkout/src/librustc_symbol_mangling"}) not skipped for "bootstrap::doc::Rustc" -- not in ["src/tools/tidy"]
---
Rustbook (x86_64-unknown-linux-gnu) - edition-guide
Building stage0 tool linkchecker (x86_64-unknown-linux-gnu)
   Compiling linkchecker v0.1.0 (/checkout/src/tools/linkchecker)
    Finished release [optimized] target(s) in 1.15s
std/convert/trait.From.html:721: broken link - std/convert/enum.Option.html
core/convert/trait.From.html:284: broken link - core/convert/enum.Option.html
thread 'main' panicked at 'found some broken links', src/tools/linkchecker/main.rs:43:9


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/linkchecker" "/checkout/obj/build/x86_64-unknown-linux-gnu/doc"
expected success, got: exit code: 101
---
  local time: Tue May  5 03:05:22 UTC 2020
  network time: Tue, 05 May 2020 03:05:22 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/71909/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/71909/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (4112) (python)
##[section]Finishing: Finalize Job

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@Dolpheyn
Copy link
Contributor Author

Dolpheyn commented May 5, 2020

So I have found 2 errors in my docs where I wrote the:

  1. Comments on the wrong line and
  2. Used the normal formatting {} instead of the debug one {:?} when printing Option<String>

I have fixed both, but the build pipeline still fails and I don't know what's the cause. I'd appreciate if anyone could help :D

src/libcore/option.rs Outdated Show resolved Hide resolved
Co-authored-by: Timo <timorcb@gmail.com>
@Dolpheyn
Copy link
Contributor Author

Thank you very much for helping @timotree3 . It successfully builds now! And I get what you say. So if a method is an implementation of something, the linker cannot resolve relative links even when they're supposedly in the same file? Or it only applies to the From implementations section?

@timotree3
Copy link
Contributor

@Dolpheyn

Thank you very much for helping @timotree3 . It successfully builds now!

You're very welcome :)

And I get what you say. So if a method is an implementation of something, the linker cannot resolve relative links even when they're supposedly in the same file? Or it only applies to the From implementations section?

Yeah more or less. When you put a relative link into rust documentation it resolves based on where it gets rendered. Usually that's only on one page, but in this case, because we're implementing a trait, that's two places:

The relative link enum.Option.html works on the page for Option but doesn't work on the page for From.

Does that make it clearer?

P.S. "Linker" means something else entirely.

Copy link
Member

@steveklabnik steveklabnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there! Thanks so much for this PR. I'm glad you got the linking bits sorted.

I have a few suggestions for formatting, and one for re-wording, to make these more consistent. With those changes, "r=me" as we say, which means I'm happy to see this merged.

src/libcore/option.rs Outdated Show resolved Hide resolved
src/libcore/option.rs Show resolved Hide resolved
src/libcore/option.rs Outdated Show resolved Hide resolved
src/libcore/option.rs Show resolved Hide resolved
src/libcore/option.rs Show resolved Hide resolved
src/libcore/option.rs Outdated Show resolved Hide resolved
src/libcore/option.rs Show resolved Hide resolved
src/libcore/option.rs Show resolved Hide resolved
Dolpheyn and others added 8 commits May 13, 2020 21:04
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Co-authored-by: Steve Klabnik <steve@steveklabnik.com>
Copy link
Member

@steveklabnik steveklabnik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much!

@bors: r+ rollup

@steveklabnik
Copy link
Member

Oops, I forgot bors doesn't listen to review comments.

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented May 13, 2020

📌 Commit 6c3856f has been approved by steveklabnik

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 13, 2020
@Dolpheyn
Copy link
Contributor Author

@steveklabnik

Glad to help! I'll have the formats in mind for next time :D

bors added a commit to rust-lang-ci/rust that referenced this pull request May 14, 2020
Rollup of 12 pull requests

Successful merges:

 - rust-lang#71525 (`prefix` should not be mutable.)
 - rust-lang#71741 (Pointer printing: do not print 0 offset)
 - rust-lang#71870 (Be slightly more precise about any::type_name()'s guarantees.)
 - rust-lang#71909 (Document From trait for Option implementations)
 - rust-lang#71964 (Fix bootstrap failing on win32)
 - rust-lang#72137 (Clean up E0581 explanation)
 - rust-lang#72138 (Add doc comment for `rustc_middle::mir::mono::Linkage`)
 - rust-lang#72150 (Remove UnnormalizedProjection)
 - rust-lang#72151 (Update books)
 - rust-lang#72163 (docs: remove comment referencing non-existent method)
 - rust-lang#72169 (Clean up E0582 explanation)
 - rust-lang#72183 (Fix Arc::decr_strong_count doc test)

Failed merges:

r? @ghost
@bors bors merged commit a6c1f61 into rust-lang:master May 14, 2020
@Dolpheyn Dolpheyn deleted the doc-from-trait-for-option branch May 14, 2020 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants