Skip to content

Std panicking unsafe block in unsafe fn - #74200

Merged
bors merged 1 commit into
rust-lang:masterfrom
poliorcetics:std-panicking-unsafe-block-in-unsafe-fn
Aug 10, 2020
Merged

Std panicking unsafe block in unsafe fn#74200
bors merged 1 commit into
rust-lang:masterfrom
poliorcetics:std-panicking-unsafe-block-in-unsafe-fn

Conversation

@poliorcetics

@poliorceticspoliorcetics commented Jul 9, 2020

Copy link
Copy Markdown
Contributor

Partial fix of #73904.

This encloses unsafe operations in unsafe fn in libstd/ffi/panicking.rs.

I also made a two lines change to libstd/thread/local.rs to add the necessary unsafe block without breaking everything else.

@rustbot modify labels: F-unsafe-block-in-unsafe-fn

@rust-highfive

rust-highfive commented Jul 9, 2020

Copy link
Copy Markdown
Contributor

r? @shepmaster

(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 Jul 9, 2020
@LeSeulArtichautLeSeulArtichaut mentioned this pull request Jul 11, 2020
Closed
22 tasks
@crlf0710crlf0710 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2020
shepmaster
shepmaster reviewed Jul 27, 2020
View reviewed changes
Comment threadsrc/libstd/thread/local.rs Outdated
Mark-Simulacrum
Mark-Simulacrum reviewed Jul 27, 2020
View reviewed changes
Comment threadsrc/libstd/panicking.rs Outdated
Comment threadsrc/libstd/panicking.rs Outdated
Comment threadsrc/libstd/thread/local.rs Outdated
@poliorcetics
poliorceticsforce-pushed the std-panicking-unsafe-block-in-unsafe-fn branch from 5fc0e08 to 2292064CompareJuly 27, 2020 20:21
@poliorcetics

poliorcetics commented Jul 27, 2020

Copy link
Copy Markdown
ContributorAuthor

@Mark-Simulacrum the last commit made the do_catch and do_call function unsafe, with what I hope are good SAFETY comments. I also changed the others to fix them according to your comments.

@poliorceticspoliorcetics mentioned this pull request Jul 27, 2020
Closed
@bors

bors commented Jul 28, 2020

Copy link
Copy Markdown
Collaborator

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

@Mark-Simulacrum

Mark-Simulacrum commented Jul 28, 2020

Copy link
Copy Markdown
Member

r=me with a rebase

@poliorcetics
poliorceticsforce-pushed the std-panicking-unsafe-block-in-unsafe-fn branch from 12fec55 to a39aae8CompareJuly 28, 2020 16:48
@poliorcetics

poliorcetics commented Jul 28, 2020

Copy link
Copy Markdown
ContributorAuthor

Rebase done, checks are in progress. 😃

@Mark-Simulacrum

Mark-Simulacrum commented Jul 28, 2020

Copy link
Copy Markdown
Member

Please also squash all commits into one.

@poliorcetics
Disallow missing unsafe blocks in unsafe fn in panicking.rs
82ccdab
This adds SAFETY comments where necessary, explaining the preconditions
and how they are respected.
@poliorcetics
poliorceticsforce-pushed the std-panicking-unsafe-block-in-unsafe-fn branch from a39aae8 to 82ccdabCompareJuly 29, 2020 19:59
@Dylan-DPC-zz

Dylan-DPC-zz commented Aug 9, 2020

Copy link
Copy Markdown

@bors r=Mark-Simulacrum rollup

@bors

bors commented Aug 9, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 82ccdab has been approved by Mark-Simulacrum

@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 Aug 9, 2020
@JohnTitorJohnTitor mentioned this pull request Aug 10, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 10, 2020
@bors
Auto merge ofrust-lang#75351- JohnTitor:rollup-q9udsyx, r=JohnTitor
cee62c1
Rollup of 8 pull requests
Successful merges:
- rust-lang#74200 (Std panicking unsafe block in unsafe fn)
- rust-lang#75286 (Add additional case for Path starts with)
- rust-lang#75318 (Resolve `char` as a primitive even if there is a module in scope)
- rust-lang#75320 (Detect likely `for foo of bar` JS syntax)
- rust-lang#75328 (Cleanup E0749)
- rust-lang#75344 (Rename "Important traits" to "Notable traits")
- rust-lang#75348 (Move to intra-doc links in library/core/src/time.rs)
- rust-lang#75350 (Do not ICE when lowering invalid extern fn with bodies)
Failed merges:
r? @ghost
@bors
bors merged commit 62e5488 into rust-lang:masterAug 10, 2020
@poliorcetics
poliorcetics deleted the std-panicking-unsafe-block-in-unsafe-fn branch August 10, 2020 16:54
@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shepmastershepmastershepmaster left review comments
@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments

Assignees

@shepmastershepmaster

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.47.0

Development

Successfully merging this pull request may close these issues.

9 participants

@poliorcetics@rust-highfive@bors@Mark-Simulacrum@Dylan-DPC-zz@shepmaster@cuviper@crlf0710@rustbot