summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-27 15:30:31 +0000
committerbors <bors@rust-lang.org>2020-01-27 15:30:31 +0000
commit5e1a799842ba6ed4a57e91f7ab9435947482f7d8 (patch)
tree322e3c225bae8356189d398766651ba7d96ba0d0 /src/test
parent3f41b032eef8b749409b529225f22571075a8aeb (diff)
parent4600d3c594a6ea68aaa944386d14f0c20179861e (diff)
downloadrust-1.41.0.tar.gz
rust-1.41.0.zip
Auto merge of #68568 - pietroalbini:stable-next, r=pietroalbini 1.41.0
[stable] Rust 1.41.0 stable release

This PR produces the 1.41.0 stable release, backporting the following PRs as well:

* #68494: Make pointers to statics internal
* #67928: Update RELEASES.md for 1.41.0

r? @ghost
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/async-await/issues/issue-67611-static-mut-refs.rs33
-rw-r--r--src/test/ui/generator/static-mut-reference-across-yield.rs29
2 files changed, 62 insertions, 0 deletions
diff --git a/src/test/ui/async-await/issues/issue-67611-static-mut-refs.rs b/src/test/ui/async-await/issues/issue-67611-static-mut-refs.rs
new file mode 100644
index 00000000000..dda4a151dd2
--- /dev/null
+++ b/src/test/ui/async-await/issues/issue-67611-static-mut-refs.rs
@@ -0,0 +1,33 @@
+// build-pass
+// edition:2018
+
+static mut A: [i32; 5] = [1, 2, 3, 4, 5];
+
+fn is_send_sync<T: Send + Sync>(_: T) {}
+
+async fn fun() {
+    let u = unsafe { A[async { 1 }.await] };
+    unsafe {
+        match A {
+            i if async { true }.await => (),
+            _ => (),
+        }
+    }
+}
+
+fn main() {
+    let index_block = async {
+        let u = unsafe { A[async { 1 }.await] };
+    };
+    let match_block = async {
+        unsafe {
+            match A {
+                i if async { true }.await => (),
+                _ => (),
+            }
+        }
+    };
+    is_send_sync(index_block);
+    is_send_sync(match_block);
+    is_send_sync(fun());
+}
diff --git a/src/test/ui/generator/static-mut-reference-across-yield.rs b/src/test/ui/generator/static-mut-reference-across-yield.rs
new file mode 100644
index 00000000000..2926bba9978
--- /dev/null
+++ b/src/test/ui/generator/static-mut-reference-across-yield.rs
@@ -0,0 +1,29 @@
+// build-pass
+#![feature(generators)]
+
+static mut A: [i32; 5] = [1, 2, 3, 4, 5];
+
+fn is_send_sync<T: Send + Sync>(_: T) {}
+
+fn main() {
+    unsafe {
+        let gen_index = static || {
+            let u = A[{
+                yield;
+                1
+            }];
+        };
+        let gen_match = static || match A {
+            i if {
+                yield;
+                true
+            } =>
+            {
+                ()
+            }
+            _ => (),
+        };
+        is_send_sync(gen_index);
+        is_send_sync(gen_match);
+    }
+}