about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-08-22 15:28:31 +0000
committerbors <bors@rust-lang.org>2024-08-22 15:28:31 +0000
commite881c428f58b99f6dcd362fd201f0cf857ade861 (patch)
tree0ae2291ee0556f58597306af71162a56fef9218a
parent8b10bda1e497df32cffaec1cdbc1e818eb70ba3b (diff)
parente698ca1246d546532dfc966a228c54918989c1b2 (diff)
downloadrust-e881c428f58b99f6dcd362fd201f0cf857ade861.tar.gz
rust-e881c428f58b99f6dcd362fd201f0cf857ade861.zip
Auto merge of #3834 - sun-jacobi:tb-comment, r=RalfJung
Fix a misleading comment in `tests/pass/tree_borrows/tree-borrows.rs`

The original comment is somewhat misleading.

Since we don't add a protector for `x` here, `f` should be allowed to deallocate `x`.
-rw-r--r--src/tools/miri/tests/pass/tree_borrows/tree-borrows.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/tests/pass/tree_borrows/tree-borrows.rs b/src/tools/miri/tests/pass/tree_borrows/tree-borrows.rs
index adad18c1af3..c741e4de6d5 100644
--- a/src/tools/miri/tests/pass/tree_borrows/tree-borrows.rs
+++ b/src/tools/miri/tests/pass/tree_borrows/tree-borrows.rs
@@ -321,7 +321,7 @@ fn not_unpin_not_protected() {
     pub struct NotUnpin(#[allow(dead_code)] i32, PhantomPinned);
 
     fn inner(x: &mut NotUnpin, f: fn(&mut NotUnpin)) {
-        // `f` may mutate, but it may not deallocate!
+        // `f` is allowed to deallocate `x`.
         f(x)
     }