forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#112017 - Nemo157:unsafe-block-rustfix, r=eholk
Add MVP suggestion for `unsafe_op_in_unsafe_fn` Rebase of rust-lang#99827 cc tracking issue rust-lang#71668 No real changes since the original PR, just migrated the new suggestion to use fluent messages and added a couple more testcases, AFAICT from the discussion there were no outstanding changes requested.
- Loading branch information
Showing
8 changed files
with
292 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| pub unsafe fn unsf() {} | ||
|
|
||
| #[macro_export] | ||
| macro_rules! unsafe_macro { () => ($crate::unsf()) } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // run-rustfix | ||
| // aux-build:external_unsafe_macro.rs | ||
|
|
||
| #![deny(unsafe_op_in_unsafe_fn)] //~ NOTE | ||
|
|
||
| extern crate external_unsafe_macro; | ||
|
|
||
| unsafe fn unsf() {} | ||
|
|
||
| pub unsafe fn foo() { unsafe { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| unsf(); //~ ERROR call to unsafe function is unsafe | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| unsf(); //~ ERROR call to unsafe function is unsafe | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| }} | ||
|
|
||
| pub unsafe fn bar(x: *const i32) -> i32 { unsafe { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| let y = *x; //~ ERROR dereference of raw pointer is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| y + *x //~ ERROR dereference of raw pointer is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| }} | ||
|
|
||
| static mut BAZ: i32 = 0; | ||
| pub unsafe fn baz() -> i32 { unsafe { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| let y = BAZ; //~ ERROR use of mutable static is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| y + BAZ //~ ERROR use of mutable static is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| }} | ||
|
|
||
| macro_rules! unsafe_macro { () => (unsf()) } | ||
| //~^ ERROR call to unsafe function is unsafe | ||
| //~| NOTE | ||
| //~| NOTE | ||
| //~| ERROR call to unsafe function is unsafe | ||
| //~| NOTE | ||
| //~| NOTE | ||
|
|
||
| pub unsafe fn unsafe_in_macro() { unsafe { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| unsafe_macro!(); | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| unsafe_macro!(); | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| }} | ||
|
|
||
| pub unsafe fn unsafe_in_external_macro() { | ||
| // FIXME: https://github.com/rust-lang/rust/issues/112504 | ||
| // FIXME: ~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| external_unsafe_macro::unsafe_macro!(); | ||
| external_unsafe_macro::unsafe_macro!(); | ||
| } | ||
|
|
||
| fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // run-rustfix | ||
| // aux-build:external_unsafe_macro.rs | ||
|
|
||
| #![deny(unsafe_op_in_unsafe_fn)] //~ NOTE | ||
|
|
||
| extern crate external_unsafe_macro; | ||
|
|
||
| unsafe fn unsf() {} | ||
|
|
||
| pub unsafe fn foo() { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| unsf(); //~ ERROR call to unsafe function is unsafe | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| unsf(); //~ ERROR call to unsafe function is unsafe | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| } | ||
|
|
||
| pub unsafe fn bar(x: *const i32) -> i32 { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| let y = *x; //~ ERROR dereference of raw pointer is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| y + *x //~ ERROR dereference of raw pointer is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| } | ||
|
|
||
| static mut BAZ: i32 = 0; | ||
| pub unsafe fn baz() -> i32 { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| let y = BAZ; //~ ERROR use of mutable static is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| y + BAZ //~ ERROR use of mutable static is unsafe and requires unsafe block | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| } | ||
|
|
||
| macro_rules! unsafe_macro { () => (unsf()) } | ||
| //~^ ERROR call to unsafe function is unsafe | ||
| //~| NOTE | ||
| //~| NOTE | ||
| //~| ERROR call to unsafe function is unsafe | ||
| //~| NOTE | ||
| //~| NOTE | ||
|
|
||
| pub unsafe fn unsafe_in_macro() { | ||
| //~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| unsafe_macro!(); | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| unsafe_macro!(); | ||
| //~^ NOTE | ||
| //~| NOTE | ||
| } | ||
|
|
||
| pub unsafe fn unsafe_in_external_macro() { | ||
| // FIXME: https://github.com/rust-lang/rust/issues/112504 | ||
| // FIXME: ~^ NOTE an unsafe function restricts its caller, but its body is safe by default | ||
| external_unsafe_macro::unsafe_macro!(); | ||
| external_unsafe_macro::unsafe_macro!(); | ||
| } | ||
|
|
||
| fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| error: call to unsafe function is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:12:5 | ||
| | | ||
| LL | unsf(); | ||
| | ^^^^^^ call to unsafe function | ||
| | | ||
| = note: consult the function's documentation for information on how to avoid undefined behavior | ||
| note: an unsafe function restricts its caller, but its body is safe by default | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:10:1 | ||
| | | ||
| LL | pub unsafe fn foo() { | ||
| | ^^^^^^^^^^^^^^^^^^^ | ||
| note: the lint level is defined here | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:4:9 | ||
| | | ||
| LL | #![deny(unsafe_op_in_unsafe_fn)] | ||
| | ^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| error: call to unsafe function is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:15:5 | ||
| | | ||
| LL | unsf(); | ||
| | ^^^^^^ call to unsafe function | ||
| | | ||
| = note: consult the function's documentation for information on how to avoid undefined behavior | ||
|
|
||
| error: dereference of raw pointer is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:22:13 | ||
| | | ||
| LL | let y = *x; | ||
| | ^^ dereference of raw pointer | ||
| | | ||
| = note: raw pointers may be null, dangling or unaligned; they can violate aliasing rules and cause data races: all of these are undefined behavior | ||
| note: an unsafe function restricts its caller, but its body is safe by default | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:20:1 | ||
| | | ||
| LL | pub unsafe fn bar(x: *const i32) -> i32 { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| error: dereference of raw pointer is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:25:9 | ||
| | | ||
| LL | y + *x | ||
| | ^^ dereference of raw pointer | ||
| | | ||
| = note: raw pointers may be null, dangling or unaligned; they can violate aliasing rules and cause data races: all of these are undefined behavior | ||
|
|
||
| error: use of mutable static is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:33:13 | ||
| | | ||
| LL | let y = BAZ; | ||
| | ^^^ use of mutable static | ||
| | | ||
| = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior | ||
| note: an unsafe function restricts its caller, but its body is safe by default | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:31:1 | ||
| | | ||
| LL | pub unsafe fn baz() -> i32 { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| error: use of mutable static is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:36:9 | ||
| | | ||
| LL | y + BAZ | ||
| | ^^^ use of mutable static | ||
| | | ||
| = note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior | ||
|
|
||
| error: call to unsafe function is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:41:36 | ||
| | | ||
| LL | macro_rules! unsafe_macro { () => (unsf()) } | ||
| | ^^^^^^ call to unsafe function | ||
| ... | ||
| LL | unsafe_macro!(); | ||
| | --------------- in this macro invocation | ||
| | | ||
| = note: consult the function's documentation for information on how to avoid undefined behavior | ||
| note: an unsafe function restricts its caller, but its body is safe by default | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:49:1 | ||
| | | ||
| LL | pub unsafe fn unsafe_in_macro() { | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| = note: this error originates in the macro `unsafe_macro` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
|
||
| error: call to unsafe function is unsafe and requires unsafe block (error E0133) | ||
| --> $DIR/wrapping-unsafe-block-sugg.rs:41:36 | ||
| | | ||
| LL | macro_rules! unsafe_macro { () => (unsf()) } | ||
| | ^^^^^^ call to unsafe function | ||
| ... | ||
| LL | unsafe_macro!(); | ||
| | --------------- in this macro invocation | ||
| | | ||
| = note: consult the function's documentation for information on how to avoid undefined behavior | ||
| = note: this error originates in the macro `unsafe_macro` (in Nightly builds, run with -Z macro-backtrace for more info) | ||
|
|
||
| error: aborting due to 8 previous errors | ||
|
|