Skip to content

rustdoc-json: Fix has_body - #81318

Merged
bors merged 2 commits into
rust-lang:masterfrom
CraftSpider:json-trait-fix
Feb 5, 2021
Merged

rustdoc-json: Fix has_body#81318
bors merged 2 commits into
rust-lang:masterfrom
CraftSpider:json-trait-fix

Conversation

@CraftSpider

@CraftSpiderCraftSpider commented Jan 24, 2021

Copy link
Copy Markdown
Contributor

Previously, has_body was always true. Now propagate the type of the method to set it correctly. Relies on #81287, that will need to be merged first.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @jyn514

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 24, 2021
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job mingw-check failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
configure: rust.channel := nightly
configure: rust.debug-assertions := True
configure: llvm.assertions := True
configure: dist.missing-tools := True
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: configure: run `python /checkout/x.py --help`
configure: ---
Checking which error codes lack tests...
Found 435 error codes
Found 0 error codes with no tests
Done!
tidy error: /checkout/src/test/rustdoc-json/traits/has_body.rs: leading newline
some tidy checks failed
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "/checkout/obj/build"
expected success, got: exit code: 1

@camelidcamelid added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-json Area: Rustdoc JSON backend labels Jan 24, 2021
@jyn514jyn514 added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 24, 2021
@bors

bors commented Jan 27, 2021

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #80987) made this pull request unmergeable. Please resolve the merge conflicts.

@CraftSpider

Copy link
Copy Markdown
ContributorAuthor

@rustbot modify labels: -S-blocked +S-waiting-on-review

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jan 29, 2021
Comment threadsrc/librustdoc/json/conversions.rs
@jyn514

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Feb 4, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 1c60d27 has been approved by jyn514

@borsbors 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 Feb 4, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 4, 2021
rustdoc-json: Fix has_body
Previously, `has_body` was always true. Now propagate the type of the method to set it correctly. Relies on rust-lang#81287, that will need to be merged first.
@m-ou-sem-ou-se mentioned this pull request Feb 4, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 4, 2021
rustdoc-json: Fix has_body
Previously, `has_body` was always true. Now propagate the type of the method to set it correctly. Relies on rust-lang#81287, that will need to be merged first.
@m-ou-sem-ou-se mentioned this pull request Feb 4, 2021
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Feb 5, 2021
rustdoc-json: Fix has_body
Previously, `has_body` was always true. Now propagate the type of the method to set it correctly. Relies on rust-lang#81287, that will need to be merged first.
This was referenced Feb 5, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 5, 2021
Rollup of 15 pull requests
Successful merges:
- rust-lang#79554 (Generic associated types in trait paths)
- rust-lang#80726 (relax adt unsizing requirements)
- rust-lang#81307 (Handle `Span`s for byte and raw strings and add more detail )
- rust-lang#81318 (rustdoc-json: Fix has_body)
- rust-lang#81456 (Make remote-test-server easier to use with new targets)
- rust-lang#81497 (rustdoc: Move `display_fn` struct inside `display_fn`)
- rust-lang#81500 (Remove struct_type from union output)
- rust-lang#81542 (Expose correct symlink API on WASI)
- rust-lang#81676 (Add more information to the error code for 'crate not found')
- rust-lang#81682 (Add additional bitset benchmarks)
- rust-lang#81730 (Make `Allocator` object-safe)
- rust-lang#81763 (Cleanup rustdoc pass descriptions a bit)
- rust-lang#81767 (Update LayoutError/LayoutErr stability attributes)
- rust-lang#81771 (Indicate change in RSS from start to end of pass in time-passes output)
- rust-lang#81781 (Fix `install-awscli.sh` error in CI)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 0493e3a into rust-lang:masterFeb 5, 2021
@rustbotrustbot added this to the 1.51.0 milestone Feb 5, 2021
@CraftSpider
CraftSpider deleted the json-trait-fix branch February 6, 2021 00:42
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustdoc-jsonArea: Rustdoc JSON backendS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@CraftSpider@rust-highfive@rust-log-analyzer@bors@jyn514@camelid@rustbot