Skip to content

Rollup of 5 pull requests #64816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b8a040f
Remove tx_to_llvm_workers from TyCtxt
Mark-Simulacrum Sep 25, 2019
80db06d
Fix ExitStatus on Fuchsia
tmandry Sep 25, 2019
5418e15
Fix issue #64732
onehr Sep 25, 2019
a048447
Add test case for issue #64732
onehr Sep 26, 2019
ece6f83
Refuse downgrading NLL errors on Rust 2015.
Centril Sep 6, 2019
aff9c83
rustc_mir: remove dead code for downgrading errors.
Centril Sep 6, 2019
6ec9b3a
Adjust & --bless tests due to no longer downgrading NLL errors on 2015.
Centril Sep 6, 2019
487f8ab
add test for #53432.
Centril Sep 6, 2019
2fb0bba
remove feature(nll) from #45157 test.
Centril Sep 6, 2019
1256613
remove feature(nll) from #31567 test.
Centril Sep 6, 2019
b638aa1
remove feature(nll) from #27868 test.
Centril Sep 6, 2019
2b80ed9
remove feature(nll) in more cases.
Centril Sep 6, 2019
dfdd4d7
rm "src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.s…
Centril Sep 25, 2019
ce8c5d2
issue-#45696-scribble...: remove outdated comment.
Centril Sep 25, 2019
f8af766
cargotest: bump webrender
Centril Sep 26, 2019
9a2cc54
cargotest: bump iron
Centril Sep 26, 2019
8220252
Add test for E0543
GuillaumeGomez Sep 26, 2019
5a0e461
issue-#45696: remove ignore-compare-mode-nll
Centril Sep 26, 2019
3b5fbb6
Rollup merge of #64221 - Centril:nll-no-migrate-2015, r=matthewjasper
Centril Sep 26, 2019
0130393
Rollup merge of #64772 - Mark-Simulacrum:no-tyctxt-tx, r=eddyb
Centril Sep 26, 2019
95ea4a1
Rollup merge of #64783 - onehr:onehrxn, r=varkor
Centril Sep 26, 2019
0717483
Rollup merge of #64787 - tmandry:fuchsia-exitstatus, r=cramertj
Centril Sep 26, 2019
02a8505
Rollup merge of #64812 - GuillaumeGomez:add-test-for-e0543, r=Centril
Centril Sep 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
issue-#45696-scribble...: remove outdated comment.
  • Loading branch information
Centril committed Sep 26, 2019
commit ce8c5d2749e68b2bade9df0133c1c3d9ee390d4b
2 changes: 0 additions & 2 deletions src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// rust-lang/rust#45696: This test is checking that we *cannot* return
// mutable borrows that would be scribbled over by destructors before
// the return occurs.
//
// We will explicitly test NLL; thus we will also skip the automated compare-mode=nll.

// ignore-compare-mode-nll
// ignore-compare-mode-polonius
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0713]: borrow may still be in use when destructor runs
--> $DIR/issue-45696-scribble-on-boxed-borrow.rs:37:5
--> $DIR/issue-45696-scribble-on-boxed-borrow.rs:35:5
|
LL | fn scribbled<'a>(s: Scribble<'a>) -> &'a mut u32 {
| -- lifetime `'a` defined here
Expand All @@ -9,7 +9,7 @@ LL | }
| - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait

error[E0713]: borrow may still be in use when destructor runs
--> $DIR/issue-45696-scribble-on-boxed-borrow.rs:42:5
--> $DIR/issue-45696-scribble-on-boxed-borrow.rs:40:5
|
LL | fn boxed_scribbled<'a>(s: Box<Scribble<'a>>) -> &'a mut u32 {
| -- lifetime `'a` defined here
Expand All @@ -19,7 +19,7 @@ LL | }
| - here, drop of `s` needs exclusive access to `*s.0`, because the type `Scribble<'_>` implements the `Drop` trait

error[E0713]: borrow may still be in use when destructor runs
--> $DIR/issue-45696-scribble-on-boxed-borrow.rs:47:5
--> $DIR/issue-45696-scribble-on-boxed-borrow.rs:45:5
|
LL | fn boxed_boxed_scribbled<'a>(s: Box<Box<Scribble<'a>>>) -> &'a mut u32 {
| -- lifetime `'a` defined here
Expand Down