about summary refs log tree commit diff
path: root/src/librustc_mir/transform
diff options
context:
space:
mode:
authorMichael Lamparski <diagonaldevice@gmail.com>2018-02-17 22:31:14 -0500
committerMichael Lamparski <diagonaldevice@gmail.com>2018-02-17 22:31:14 -0500
commit42df8c56cc6f1b94a9c0e8e55462dff57d95e4ac (patch)
tree0ae3f1c7acf766c59b2dd82669fbcab3f7dec979 /src/librustc_mir/transform
parent5313e8728f028cb7914f3c9f02804158a5732b52 (diff)
downloadrust-42df8c56cc6f1b94a9c0e8e55462dff57d95e4ac.tar.gz
rust-42df8c56cc6f1b94a9c0e8e55462dff57d95e4ac.zip
unused_unsafe: don't label irrelevant fns
Diffstat (limited to 'src/librustc_mir/transform')
-rw-r--r--src/librustc_mir/transform/check_unsafety.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/librustc_mir/transform/check_unsafety.rs b/src/librustc_mir/transform/check_unsafety.rs
index bbc7803b84d..3524255e037 100644
--- a/src/librustc_mir/transform/check_unsafety.rs
+++ b/src/librustc_mir/transform/check_unsafety.rs
@@ -386,10 +386,13 @@ fn is_enclosed(tcx: TyCtxt,
         if used_unsafe.contains(&parent_id) {
             Some(("block".to_string(), parent_id))
         } else if let Some(hir::map::NodeItem(&hir::Item {
-            node: hir::ItemFn(_, hir::Unsafety::Unsafe, _, _, _, _),
+            node: hir::ItemFn(_, fn_unsafety, _, _, _, _),
             ..
         })) = tcx.hir.find(parent_id) {
-            Some(("fn".to_string(), parent_id))
+            match fn_unsafety {
+                hir::Unsafety::Unsafe => Some(("fn".to_string(), parent_id)),
+                hir::Unsafety::Normal => None,
+            }
         } else {
             is_enclosed(tcx, used_unsafe, parent_id)
         }