Skip to content

Rollup of 2 pull requests#70118

Merged
bors merged 69 commits intorust-lang:masterfrom
emilyalbini:rollup-pgjc90i
Mar 19, 2020
Merged

Rollup of 2 pull requests#70118
bors merged 69 commits intorust-lang:masterfrom
emilyalbini:rollup-pgjc90i

Conversation

@emilyalbini
Copy link
Member

@emilyalbini emilyalbini commented Mar 18, 2020

Successful merges:

Failed merges:

r? @ghost

gilescope and others added 30 commits February 13, 2020 19:42
@gilescope
keyword docs for else and inkeyword docs for else and in.
a113609
@GuillaumeGomez
clean up E0308 explanation
57f1bb1
@GuillaumeGomez
Update tests
64460a1
@RalfJung
miri: categorize errors into "unsupported" and "UB"
f5efb68 
Also slightly refactor pointer bounds checks to avoid creating unnecessary temporary Errors
@RalfJung
fmt, tweak messages and bless
d02543a
@RalfJung
generalize InvalidNullPointerUsage to InvalidIntPointerUsage
9a95b01
@RalfJung
fmt, and fix rustfmt-induced rebase hickup
3ebcd78
@RalfJung
start Miri messages lower-case
2764d3d
@RalfJung
explain why we catch PointerUseAfterFree
3e61442
@RalfJung
avoid boolean inversion
d8f8168
@RalfJung
we are on 2018 edition, use try block
9681422
@RalfJung
make error message less confusing
93436d8
@RalfJung
fmt
e219dd4
@jonas-schievink
Use smaller discriminants for generators
b2779d8
@jonas-schievink
Add a test for generator discriminants
4266807
@jonas-schievink
Fix rebase fallout
49aabd8
@Centril
remove unnecessary hir::map imports
73a625b
@Centril
use direct imports for rustc::{lint, session}.
4392a8b
@matthewjasper
Remove free_region_map from TypeckTables
5a9ccc9 
It was unused.
@matthewjasper
Don't use TypeckTables in NiceRegionError
cefd030 
Regions in TypeckTables will be erased, so are unusable for error
reporting.
@matthewjasper
Erase regions in writeback
0a7f16e 
Also skip duplicated region solving entirely with `-Zborrowck=mir`.
@matthewjasper
Update tests for erasing regions in typeck
1ee5829
@GuillaumeGomez
Don't prepend with space before paren
aa20d96
@ecstatic-morse
Make newtype_index methods const
429b16e
@ecstatic-morse
Rename from_u32_const -> from_u32
7f5a284
@ecstatic-morse
Add requisite feature gates for const assert
cc4a577
@ecstatic-morse
Hold index of generator self arg in const
9ac93ee
@GuillaumeGomez
Update pretty tests
81172d8
@GuillaumeGomez
Update rustdoc test and remove TODO comment
9a017da
@Centril
submod_path_from_attr: simplify & document
bc75cba
@bors
Copy link
Collaborator

bors commented Mar 19, 2020

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing 57e1da5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 19, 2020
@bors bors merged commit 57e1da5 into rust-lang:master Mar 19, 2020
This was referenced Mar 19, 2020
Closed
Merged
This was referenced Mar 19, 2020
Closed
Closed
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 19, 2020

📣 Toolstate changed by #70118!

Tested on commit 57e1da5.
Direct link to PR: #70118

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
💔 book on windows: test-pass → test-fail (cc @carols10cents @steveklabnik).
💔 book on linux: test-pass → test-fail (cc @carols10cents @steveklabnik).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 19, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#70118!
917bbf8 
Tested on commit rust-lang/rust@57e1da5.
Direct link to PR: <rust-lang/rust#70118>

💔 clippy-driver on windows: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 clippy-driver on linux: test-pass → build-fail (cc @mcarton @oli-obk @Manishearth @flip1995 @yaahc @phansch @llogiq).
💔 miri on windows: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
💔 book on windows: test-pass → test-fail (cc @carols10cents @steveklabnik).
💔 book on linux: test-pass → test-fail (cc @carols10cents @steveklabnik).
This was referenced Mar 19, 2020
Merged
Merged
Merged
Merged
Closed
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Closed
Merged
Closed
Merged
Merged
Merged
Merged
@SimonSapin SimonSapin mentioned this pull request Mar 20, 2020
Closed
@emilyalbini emilyalbini deleted the rollup-pgjc90i branch December 23, 2020 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.