Auto merge of #1172 - RalfJung:rustup, r=RalfJung

Rustup and also a test for rust-lang/rust#68303
rust-lang · Feb 12, 2020 · 49aafad · 49aafad
2 parents f9615bf + a843fd4
commit 49aafad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-b5e21dbb5cabdaaadc47a4d8e3f59979dcad2871
+2d2be570970d784db5539a1d309cd22b85be910a
diff --git a/tests/run-pass/stacked-borrows/refcell.rs b/tests/run-pass/stacked-borrows/refcell.rs
@@ -4,6 +4,7 @@ fn main() {
  basic();
  ref_protector();
  ref_mut_protector();
+ rust_issue_68303();
 }
 
 fn basic() {
@@ -66,3 +67,11 @@ fn ref_mut_protector() {
  let rc = RefCell::new(0);
  break_it(&rc, rc.borrow_mut())
 }
+
+/// Make sure we do not have bad enum layout optimizations.
+fn rust_issue_68303() {
+ let optional=Some(RefCell::new(false));
+ let mut handle=optional.as_ref().unwrap().borrow_mut();
+ assert!(optional.is_some());
+ *handle=true;
+}