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.

Sign up for GitHub

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

Jump to bottom

rustdoc-JSON: Rename "object safe" to "dyn compatible" #131595

Merged
merged 1 commit into from
Oct 17, 2024
Merged

rustdoc-JSON: Rename "object safe" to "dyn compatible" #131595

merged 1 commit into from
Oct 17, 2024

Conversation

fmease
Copy link
Member

@fmease fmease commented Oct 12, 2024 •
edited
Loading

Blocked: Sits atop #131594. Only the last commit is relevant. (rebased)

Part of #130852.

r? aDotInTheVoid or rustdoc

@fmease fmease added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Oct 12, 2024
@rustbot rustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Oct 12, 2024
@fmease fmease removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2024
@aDotInTheVoid
Copy link
Member

r=me once the previous PR also lands

@fmease fmease mentioned this pull request Oct 16, 2024
Open
12 tasks
@fmease fmease force-pushed the rustdoc-json-mv-obj-safe-dyn-compat branch from a00fd86 to 2e6f3bd Compare October 16, 2024 21:01
@fmease fmease removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Oct 16, 2024
@fmease fmease marked this pull request as ready for review October 16, 2024 21:03
@rustbot
Copy link
Collaborator

rustbot commented Oct 16, 2024

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic, @obi1kenobi

@fmease
Copy link
Member Author

fmease commented Oct 16, 2024

@bors r=aDotInTheVoid rollup

@bors
Copy link
Contributor

bors commented Oct 16, 2024

📌 Commit 2e6f3bd has been approved by aDotInTheVoid

It is now in the queue for this repository.

@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 Oct 16, 2024
@aDotInTheVoid aDotInTheVoid mentioned this pull request Oct 16, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2024
@bors
Auto merge of rust-lang#131595 - fmease:rustdoc-json-mv-obj-safe-dyn-…
33d17c2 
…compat, r=aDotInTheVoid

rustdoc-JSON: Rename "object safe" to "dyn compatible"

~~Blocked: Sits atop rust-lang#131594. Only the last commit is relevant.~~ (rebased)

Part of rust-lang#130852.

r? aDotInTheVoid or rustdoc
@bors
Copy link
Contributor

bors commented Oct 17, 2024

⌛ Testing commit 2e6f3bd with merge 33d17c2...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
[RUSTC-TIMING] miri test:false 5.551
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Thu, Oct 17, 2024  2:12:30 AM
  network time: Thu, 17 Oct 2024 02:12:30 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Contributor

bors commented Oct 17, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 17, 2024
@aDotInTheVoid
Copy link
Member

@bors retry

@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 Oct 17, 2024
@bors
Copy link
Contributor

bors commented Oct 17, 2024

⌛ Testing commit 2e6f3bd with merge ec3cb64...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2024
@bors
Auto merge of rust-lang#131595 - fmease:rustdoc-json-mv-obj-safe-dyn-…
ec3cb64 
…compat, r=aDotInTheVoid

rustdoc-JSON: Rename "object safe" to "dyn compatible"

~~Blocked: Sits atop rust-lang#131594. Only the last commit is relevant.~~ (rebased)

Part of rust-lang#130852.

r? aDotInTheVoid or rustdoc
@bors bors mentioned this pull request Oct 17, 2024
Merged
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 17, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2024
@bors
Auto merge of rust-lang#131827 - matthiaskrgr:rollup-umncb57, r=matth…
03983fb 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#128391 (Change orphan hint from "only" to "any uncovered type inside...")
 - rust-lang#131583 (Setting up indirect access to external data for loongarch64-linux-{musl,ohos})
 - rust-lang#131595 (rustdoc-JSON: Rename "object safe" to "dyn compatible")
 - rust-lang#131748 (cleanup canonical queries)
 - rust-lang#131798 (llvm: Tolerate propagated range metadata)
 - rust-lang#131815 (compiler: use `is_none_or` where it is clearly better)
 - rust-lang#131822 (extract `expr_assign_expected_bool_error`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f6b699c into rust-lang:master Oct 17, 2024
6 of 7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 17, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2024
@rust-timer
Unrolled build for rust-lang#131595
71bd0b7 
Rollup merge of rust-lang#131595 - fmease:rustdoc-json-mv-obj-safe-dyn-compat, r=aDotInTheVoid

rustdoc-JSON: Rename "object safe" to "dyn compatible"

~~Blocked: Sits atop rust-lang#131594. Only the last commit is relevant.~~ (rebased)

Part of rust-lang#130852.

r? aDotInTheVoid or rustdoc
@fmease fmease deleted the rustdoc-json-mv-obj-safe-dyn-compat branch October 17, 2024 13:58
@Enselic Enselic mentioned this pull request Oct 18, 2024
Closed
@aDotInTheVoid aDotInTheVoid mentioned this pull request Jan 22, 2025
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 22, 2025
@matthiaskrgr
Rollup merge of rust-lang#135898 - aDotInTheVoid:dyndoc, r=fmease
caaeb22 
rustdoc-json-types: Finalize dyn compatibility renaming

Followup to rust-lang#131595.

Part of rust-lang#130852.

Inspired by rust-lang#135858 (does the same thing but for the rustdoc-types docs).

r? `@fmease`
jhpratt added a commit to jhpratt/rust that referenced this pull request Jan 23, 2025
@jhpratt
Rollup merge of rust-lang#135898 - aDotInTheVoid:dyndoc, r=fmease
3289c8a 
rustdoc-json-types: Finalize dyn compatibility renaming

Followup to rust-lang#131595.

Part of rust-lang#130852.

Inspired by rust-lang#135858 (does the same thing but for the rustdoc-types docs).

r? ``@fmease``
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jan 23, 2025
@jieyouxu
Rollup merge of rust-lang#135898 - aDotInTheVoid:dyndoc, r=fmease
2b14046 
rustdoc-json-types: Finalize dyn compatibility renaming

Followup to rust-lang#131595.

Part of rust-lang#130852.

Inspired by rust-lang#135858 (does the same thing but for the rustdoc-types docs).

r? ```@fmease```
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 23, 2025
@matthiaskrgr
Rollup merge of rust-lang#135898 - aDotInTheVoid:dyndoc, r=fmease
4b3d7ef 
rustdoc-json-types: Finalize dyn compatibility renaming

Followup to rust-lang#131595.

Part of rust-lang#130852.

Inspired by rust-lang#135858 (does the same thing but for the rustdoc-types docs).

r? ````@fmease````
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aDotInTheVoid aDotInTheVoid

Labels
A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.84.0
Development

Successfully merging this pull request may close these issues.
5 participants
@fmease @aDotInTheVoid @rustbot @bors @rust-log-analyzer