Skip to content

Rollup of 4 pull requests #62458

New issue

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

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

Already on GitHub? # to your account

Merged
merged 9 commits into from
Jul 7, 2019
Merged

Rollup of 4 pull requests #62458

merged 9 commits into from
Jul 7, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 7, 2019

Successful merges:

Failed merges:

r? @ghost

llogiq and others added 9 commits July 3, 2019 17:54
We have the trait at this point, so we can name it in the error
message, rather than using "Trait" as a (potentially confusing)
placeholder.

Thanks to Yuki "@JohnTitor" Okushi for pointing out where to look (in
the same file) for a closely related issue for ambiguous associated
types (as opposed to items; that was rust-lang#59225, except that one won't be
quite as easy to resolve, because we actually don't have the trait
`DefId` at that point).
…sdreavus

First question mark in doctest

We have had `?` for `Result`s in doctests for some time, but so far haven't used them in doctests. With this PR, I want to start the de-`unwrap`ping of doctests – and the discussion on where to do so.

There is one downside, which is that the code can no longer be copied into a plain `main()` method, on the other hand, there should be a workable error if one does this.
…QuietMisdreavus

Add missing links in Option documentation

r? @rust-lang/docs
…lacrum

rustbuild: Cleanup global lint settings

Lint settings do not depend on `if let Some(target) = target` in any way, so they are moved out of that clause.

Internal lints now respect `RUSTC_DENY_WARNINGS`.

Crate name treatment is cleaned up a bit.

cc rust-lang#61545 @flip1995
r? @Mark-Simulacrum
…_assoc_item, r=petrochenkov

name the trait in ambiguous-associated-items fully qualified suggestion

We have the trait at this point, so we can name it in the error message, rather than using "Trait" as a (potentially confusing) placeholder.

Thanks to Yuki "@JohnTitor" Okushi for pointing out where to look (in the same file) for a closely related issue for ambiguous associated types (as opposed to items; that was rust-lang#59225, except that one won't be
quite as easy to resolve, because we actually don't have the trait `DefId` at that point).

r? @petrochenkov
@Centril
Copy link
Contributor Author

Centril commented Jul 7, 2019

@bors r+ p=4 rollup=never

@bors
Copy link
Collaborator

bors commented Jul 7, 2019

📌 Commit fb01170 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 7, 2019
@bors
Copy link
Collaborator

bors commented Jul 7, 2019

⌛ Testing commit fb01170 with merge 927a3e8...

bors added a commit that referenced this pull request Jul 7, 2019
Rollup of 4 pull requests

Successful merges:

 - #61990 (First question mark in doctest)
 - #62379 (Add missing links in Option documentation)
 - #62438 (rustbuild: Cleanup global lint settings)
 - #62455 (name the trait in ambiguous-associated-items fully qualified suggestion)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Jul 7, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Centril
Pushing 927a3e8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 7, 2019
@bors bors merged commit fb01170 into rust-lang:master Jul 7, 2019
This was referenced Jul 7, 2019
@Centril Centril deleted the rollup-j6o2sqj branch July 29, 2019 02:57
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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