8000 Rollup of 5 pull requests by Centril · Pull Request #64791 · rust-lang/rust · GitHub
[go: up one dir, main page]

Skip to content

Rollup of 5 pull requests #64791

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

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
5d79e8c
reserve `impl<T> From<!> for T`
arielb1 Jul 13, 2019
9a94ecd
improve and add tests
arielb1 Jul 13, 2019
1ec7ae1
resolve the rustc_reservation_impl attribute in 1 place
arielb1 Jul 13, 2019
b5665e8
improve comments
arielb1 Jul 27, 2019
9196b2d
add error message for case
arielb1 Jul 27, 2019
d7eb562
add test for lattice specialization
arielb1 Sep 14, 2019
5de1faf
improve comment
arielb1 Sep 18, 2019
68fd593
cite reservation impls tracking issue
nikomatsakis Sep 23, 2019
b40a64d
remove outdated fixme
nikomatsakis Sep 23, 2019
da60c53
nit: update text to avoid "lattice specialization" term
nikomatsakis Sep 23, 2019
167ab04
nit: update error text to cite tracking issue
nikomatsakis Sep 23, 2019
99dc545
add a rustdoc comment to the reservation impl
nikomatsakis Sep 24, 2019
2808a46
Rename non-`TyS` uses of `sty`
varkor Sep 16, 2019
e2e0f9a
Rename `sty` to `kind`
varkor Sep 16, 2019
bd5adc5
Rename surviving uses of `sty`
varkor Sep 16, 2019
93df1bb
Fix rebase
varkor Sep 25, 2019
b6fc4b1
Refuse downgrading NLL errors on Rust 2015.
Centril Sep 6, 2019
0c7c98f
rustc_mir: remove dead code for downgrading errors.
Centril Sep 6, 2019
b9eaad2
Adjust & --bless tests due to no longer downgrading NLL errors on 2015.
Centril Sep 6, 2019
419ed8b
add test for #53432.
Centril Sep 6, 2019
b10b8a7
remove feature(nll) from #45157 test.
Centril Sep 6, 2019
947c10c
remove feature(nll) from #31567 test.
Centril Sep 6, 2019
af26372
remove feature(nll) from #27868 test.
Centril Sep 6, 2019
86481e1
remove feature(nll) in more cases.
Centril Sep 6, 2019
9f3e61b
rm "src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.s…
Centril Sep 25, 2019
4503ad4
issue-#45696-scribble...: remove outdated comment.
Centril Sep 25, 2019
e70724c
address rebase damage
arielb1 Sep 24, 2019
bc2a373
Fix fallout
varkor Sep 25, 2019
9bd201c
Use https for curl when building for linux
tmandry Sep 25, 2019
80db06d
Fix ExitStatus on Fuchsia
tmandry Sep 25, 2019
7b0167a
Rollup merge of #62661 - arielb1:never-reserve, r=nikomatsakis
Centril Sep 26, 2019
6f0448c
Rollup merge of #64221 - Centril:nll-no-migrate-2015, r=matthewjasper
Centril Sep 26, 2019
db3fc45
Rollup merge of #64513 - varkor:sty-begone, r=eddyb
Centril Sep 26, 2019
075d758
Rollup merge of #64786 - tmandry:patch-1, r=Mark-Simulacrum
Centril Sep 26, 2019
655a21c
Rollup merge of #64787 - tmandry:fuchsia-exitstatus, r=cramertj
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 25, 2019
commit 4503ad4b4c699fbe80e513665f7194ab57abfec6
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 {
| -- lifet 7AAC ime `'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
0