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

TRPL: more backward-compatible Edition changes #135842

Merged
merged 2 commits into from
Jan 26, 2025
Merged

TRPL: more backward-compatible Edition changes #135842

merged 2 commits into from
Jan 26, 2025

Conversation

chriskrycho
Copy link
Contributor

@chriskrycho chriskrycho commented Jan 21, 2025 •
edited
Loading

  • Improve the discussion of unsafe blocks within unsafe functions.
  • Fix formatting in Appendix A
  • Incorporate line edits to Chapter 17 from NoStarch.

@rustbot
Copy link
Collaborator

rustbot commented Jan 21, 2025

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Jan 21, 2025

⚠️ Warning ⚠️

  • Pull requests targetting the beta branch are usually filed against the beta branch, but this one is against master. Please double check that you specified the right target!
  • These commits modify submodules.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 21, 2025
@chriskrycho chriskrycho changed the title [beta] TRPL: more backward-compatible Edition changes TRPL: more backward-compatible Edition changes Jan 21, 2025
@chriskrycho chriskrycho mentioned this pull request Jan 21, 2025
Closed
@chriskrycho
TRPL: more backward-compatible Edition changes
0d90d47 
- Improve the discussion of `unsafe` blocks within `unsafe` functions.
- Fix formatting in Appendix A
@chriskrycho chriskrycho force-pushed the trpl-2024-edition-more branch from 5ce6339 to 0d90d47 Compare January 21, 2025 20:56
@ehuss
Copy link
Contributor

ehuss commented Jan 25, 2025

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 25, 2025

📌 Commit 9cfc420 has been approved by ehuss

It is now in the queue for this repository.

@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 Jan 25, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 25, 2025
@matthiaskrgr
Rollup merge of rust-lang#135842 - chriskrycho:trpl-2024-edition-more…
9d631af 
…, r=ehuss

TRPL: more backward-compatible Edition changes

- Improve the discussion of `unsafe` blocks within `unsafe` functions.
- Fix formatting in Appendix A
- Incorporate line edits to Chapter 17 from NoStarch.
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 25, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2025
@bors
Auto merge of rust-lang#136050 - matthiaskrgr:rollup-t77sm1i, r=matth…
505292d 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#133631 (Support QNX 7.1 with `io-sock`+libstd and QNX 8.0 (`no_std` only))
 - rust-lang#133951 (Make the wasm_c_abi future compat warning a hard error)
 - rust-lang#134283 (fix(libtest): Deprecate '--logfile')
 - rust-lang#134679 (Windows: remove readonly files)
 - rust-lang#135635 (Move `std::io::pipe` code into its own file)
 - rust-lang#135842 (TRPL: more backward-compatible Edition changes)
 - rust-lang#135953 (ci.py: check the return code in `run-local`)
 - rust-lang#136031 (Expand polonius MIR dump)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2025
@bors
Auto merge of rust-lang#136050 - matthiaskrgr:rollup-t77sm1i, r=matth…
cdff3ef 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#133631 (Support QNX 7.1 with `io-sock`+libstd and QNX 8.0 (`no_std` only))
 - rust-lang#133951 (Make the wasm_c_abi future compat warning a hard error)
 - rust-lang#134283 (fix(libtest): Deprecate '--logfile')
 - rust-lang#134679 (Windows: remove readonly files)
 - rust-lang#135635 (Move `std::io::pipe` code into its own file)
 - rust-lang#135842 (TRPL: more backward-compatible Edition changes)
 - rust-lang#135953 (ci.py: check the return code in `run-local`)
 - rust-lang#136031 (Expand polonius MIR dump)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 26, 2025
@matthiaskrgr
Rollup merge of rust-lang#135842 - chriskrycho:trpl-2024-edition-more…
628f7fa 
…, r=ehuss

TRPL: more backward-compatible Edition changes

- Improve the discussion of `unsafe` blocks within `unsafe` functions.
- Fix formatting in Appendix A
- Incorporate line edits to Chapter 17 from NoStarch.
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 26, 2025
Closed
jhpratt added a commit to jhpratt/rust that referenced this pull request Jan 26, 2025
@jhpratt
Rollup merge of rust-lang#135842 - chriskrycho:trpl-2024-edition-more…
da20639 
…, r=ehuss

TRPL: more backward-compatible Edition changes

- Improve the discussion of `unsafe` blocks within `unsafe` functions.
- Fix formatting in Appendix A
- Incorporate line edits to Chapter 17 from NoStarch.
@jhpratt jhpratt mentioned this pull request Jan 26, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2025
@bors
Auto merge of rust-lang#136084 - jhpratt:rollup-4li30te, r=jhpratt
3034d71 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#133631 (Support QNX 7.1 with `io-sock`+libstd and QNX 8.0 (`no_std` only))
 - rust-lang#134358 (compiler: Set `target_abi = "ilp32e"` on all riscv32e targets)
 - rust-lang#135764 (Fix tests on LLVM 20)
 - rust-lang#135812 (Fix GDB `OsString` provider on Windows )
 - rust-lang#135842 (TRPL: more backward-compatible Edition changes)
 - rust-lang#135946 (Remove extra whitespace from rustdoc breadcrumbs for copypasting)
 - rust-lang#135953 (ci.py: check the return code in `run-local`)
 - rust-lang#136019 (Add an `unchecked_div` alias to the `Div<NonZero<_>>` impls)

Failed merges:

 - rust-lang#136037 (Mark all NuttX targets as tier 3 target and support the standard library)

r? `@ghost`
`@rustbot` modify labels: rollup
@jhpratt jhpratt mentioned this pull request Jan 26, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2025
@bors
Auto merge of rust-lang#136087 - jhpratt:rollup-tam1mzn, r=jhpratt
15c6f7e 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#133631 (Support QNX 7.1 with `io-sock`+libstd and QNX 8.0 (`no_std` only))
 - rust-lang#134358 (compiler: Set `target_abi = "ilp32e"` on all riscv32e targets)
 - rust-lang#135812 (Fix GDB `OsString` provider on Windows )
 - rust-lang#135842 (TRPL: more backward-compatible Edition changes)
 - rust-lang#135946 (Remove extra whitespace from rustdoc breadcrumbs for copypasting)
 - rust-lang#135953 (ci.py: check the return code in `run-local`)
 - rust-lang#136019 (Add an `unchecked_div` alias to the `Div<NonZero<_>>` impls)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 666aaf9 into rust-lang:master Jan 26, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 26, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 26, 2025
@rust-timer
Unrolled build for rust-lang#135842
3679f93 
Rollup merge of rust-lang#135842 - chriskrycho:trpl-2024-edition-more, r=ehuss

TRPL: more backward-compatible Edition changes

- Improve the discussion of `unsafe` blocks within `unsafe` functions.
- Fix formatting in Appendix A
- Incorporate line edits to Chapter 17 from NoStarch.
@chriskrycho chriskrycho deleted the trpl-2024-edition-more branch January 27, 2025 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
4 participants
@chriskrycho @rustbot @ehuss @bors