Detect overflow in proc_macro_server subspan#75146
Conversation
|
r? @sfackler (rust_highfive has picked a reviewer for you, use r? to override) |
|
☔ The latest upstream changes (presumably #74862) made this pull request unmergeable. Please resolve the merge conflicts. |
17c4702 to
2c42d37
Compare
|
☔ The latest upstream changes (presumably #70793) made this pull request unmergeable. Please resolve the merge conflicts. |
2c42d37 to
e7b0bb0
Compare
|
@estebank -- I note that the issue suggested that we were unsure about the DWIM semantics you meant (#72237 (comment)). That said this has been open for a month now and looks reasonable to me; if there are semantics that move us from panicking to not panicking I think that'd relatively (if not perfectly) backwards compatible to move to. I am going to approve it, but we can revert or otherwise pause if necessary. @bors r+ |
|
📌 Commit e7b0bb0056c268cce0682b99beaf4e2979745245 has been approved by |
|
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
|
☔ The latest upstream changes (presumably #75207) made this pull request unmergeable. Please resolve the merge conflicts. |
e7b0bb0 to
c7012a1
Compare
|
The #75207 introduced a new bounds checking API for ranges, and used it to fix |
c7012a1 to
f8cfb2f
Compare
|
@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author |
|
@bors r+ |
|
📌 Commit f8cfb2f has been approved by |
Rollup of 10 pull requests Successful merges: - rust-lang#73955 (deny(unsafe_op_in_unsafe_fn) in libstd/process.rs) - rust-lang#75146 (Detect overflow in proc_macro_server subspan) - rust-lang#75304 (Note when a a move/borrow error is caused by a deref coercion) - rust-lang#75749 (Consolidate some duplicate code in the sys modules.) - rust-lang#75882 (Use translated variable for test string) - rust-lang#75886 (Test that bounds checks are elided for [..index] after .position()) - rust-lang#76048 (Initial support for riscv32gc_unknown_linux_gnu) - rust-lang#76198 (Make some Ordering methods const) - rust-lang#76689 (Upgrade to pulldown-cmark 0.8.0) - rust-lang#76763 (Update cargo) Failed merges: r? `@ghost`
Uh oh!
There was an error while loading. Please reload this page.