Rollup of 11 pull requests #66875

RalfJung · 2019-11-29T19:32:20Z

Successful merges:

Rephrase docs in for ptr #66379 (Rephrase docs in for ptr)
Allow customising ty::TraitRef's printing behavior #66613 (Allow customising ty::TraitRef's printing behavior)
Panic machinery comments and tweaks #66766 (Panic machinery comments and tweaks)
rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
Handle GlobalCtxt directly from librustc_interface query system #66791 (Handle GlobalCtxt directly from librustc_interface query system)
Record temporary static references in generator witnesses #66793 (Record temporary static references in generator witnesses)
Cleanup error code #66808 (Cleanup error code)
Clarifies how to tag users for assigning PRs #66826 (Clarifies how to tag users for assigning PRs)
Clarify {f32,f64}::EPSILON docs #66837 (Clarify {f32,f64}::EPSILON docs)
Miri: do not consider memory allocated by caller_location leaked #66844 (Miri: do not consider memory allocated by caller_location leaked)
Minor documentation fix #66872 (Minor documentation fix)

Failed merges:

…andler] directly The "continue" in the name was really confusing; it sounds way too much like "resume" which is a totally different concept around panics.

The construction of the GlobalCtxt is moved from a generator's stack to the Queries struct. Since the GlobalCtxt requires the HIR Forest and the arenas to live longer, those are moved into Queries the same way. The resulting handling of objects is more brittle, because consumers of the Once objects need to be careful of their initialisation.

…d elements.

fix clippy allow customising ty::TraitRef's printing behavior fix clippy stylistic fix

Fixed the documentation for any as is a trait rather than a type.

Rephrase docs in for ptr These methods can be supplied with NULL just fine, this is the whole point of `Option<&T>` return type.

Allow customising ty::TraitRef's printing behavior This pr allows to explicitly choose which representation of `TraitRef` (`<T as Trait<U>>` or `Trait<U>`) you want to print. `Debug` and `Display` representations of `TraitRef` now match. Closes rust-lang#59188.

@Dylan-DPC

Panic machinery comments and tweaks This is mostly more comments, but I also renamed some things: * `BoxMeUp::box_me_up` is not terribly descriptive, and since this is a "take"-style method (the argument is `&mut self` but the return type is fully owned, even though you can't tell from the type) I chose a name involving "take". * `continue_panic_fmt` was very confusing as it was entirely unclear what was being continued -- for some time I thought "continue" might be the same as "resume" for a panic, but that's something entirely different. So I renamed this to `begin_panic_handler`, matching the `begin_panic*` theme of the other entry points. r? @Dylan-DPC @SimonSapin

…r=oli-obk rustc: move mir::SourceScopeLocalData to a field of SourceScopeData. By having one `ClearCrossCrate<SourceScopeLocalData>` for each scope, as opposed to a single `ClearCrossCrate` for all the `SourceScopeLocalData`s, we can represent the fact that some scopes have `SourceScopeLocalData` associated with them, and some don't. This is useful when doing MIR inlining across crates, because the `ClearCrossCrate` will be `Clear` for the cross-crate MIR scopes and `Set` for the local ones. Also see rust-lang#66203 (comment) for some context around this approach. Fixes rust-lang#51314.

@Zoxc

Handle GlobalCtxt directly from librustc_interface query system This PR constructs the `GlobalCtxt` as a member of the `Queries` in librustc_interface. This simplifies the code to construct it, at the expense of added complexity in the query control flow. This allows to handle the arenas directly from librustc_interface. Based on rust-lang#66707 r? @Zoxc

…=cramertj Record temporary static references in generator witnesses Closes rust-lang#66695 * Record the pointer to static's type in MIR. * Normalize the static's type (so that constants can be compared correctly).

@Dylan-DPC

…r=Dylan-DPC Cleanup error code r? @Dylan-DPC

…ssage-assigner, r=Dylan-DPC Clarifies how to tag users for assigning PRs Clarifies language of where to put `r?` text to assign a particular user. Mostly a follow up of [this discussion](rust-lang#66797 (comment)).

Clarify `{f32,f64}::EPSILON` docs The doc for `EPSILON` says: > This is the difference between `1.0` and the next **largest** representable number. Which is a bit unclear. [Wikipedia](https://en.wikipedia.org/wiki/Machine_epsilon) says > Machine epsilon is defined as the difference between 1 and the next **larger** floating point number So this PR update the docs to match the Wikipedia version. The original PR also has this in a [comment](rust-lang#50919 (comment)).

@oli-obk

…i-obk Miri: do not consider memory allocated by caller_location leaked Fixes rust-lang/miri#1071 r? @oli-obk I am not sure if this is the best approach, but it certainly is the easiest.

Minor documentation fix Fixed the documentation for any as is a trait rather than a type.

RalfJung · 2019-11-29T19:34:28Z

@bors r+ rollup=never p=11

bors · 2019-11-29T19:34:29Z

📌 Commit 7d0b1ab has been approved by RalfJung

bors · 2019-11-29T21:23:35Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-401x5k8 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-401x5k8 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/librustc_mir/transform/promote_consts.rs
Auto-merging src/librustc_mir/transform/const_prop.rs
Auto-merging src/librustc_mir/shim.rs
CONFLICT (content): Merge conflict in src/librustc_mir/shim.rs
Auto-merging src/librustc_mir/build/scope.rs
Auto-merging src/librustc_mir/build/mod.rs
Auto-merging src/librustc/mir/visit.rs
Auto-merging src/librustc/mir/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-11-29T21:26:01Z

☔ The latest upstream changes (presumably #66321) made this pull request unmergeable. Please resolve the merge conflicts.

RalfJung · 2019-11-29T21:55:33Z

Ah, well.

cjgillot and others added 30 commits November 24, 2019 23:21

Isolate compiler queries inside the Queries type.

266ede1

Move linking ouside the interface queries.

5098ba6

Tidy.

27513a2

Fix test.

becfe5c

Rename continue_panic_fmt to panic_handler, and make it the #[panic_h…

cd5d0c7

…andler] directly The "continue" in the name was really confusing; it sounds way too much like "resume" which is a totally different concept around panics.

better comment and rename BoxMeUp::box_me_up to take_box

08f779c

Remove wrong comment.

18bb912

Pass Queries by reference.

ea1b803

Simplify early exits.

7d01b6c

Don't move stuff out of Compiler::enter.

8ffc944

Superfluous lifetime.

9d5f721

more panicking comments

3c48579

panic_handler -> begin_panic_handler (and more comments)

3a8e1b6

abort on BoxMeUp misuse

3e96ca2

expand comment

61486f4

explain why __rust_start_panic does not take a Box

4a19ef9

rename update_count_then_panic -> rust_panic_without_hook

babe9fc

Reduce righward drift.

68b1ac9

Review nits.

144d1c2

Make the HIR map own the Definitions.

58a9c73

Formatting.

7b71e9a

Move local Arena to Queries.

7e72b36

Record temporary static references in generator witnesses

1f850f6

Rename lifetimes.

79e2324

Rename BoxedGlobalCtxt.

e5ed101

Simplify handling of AllArenas.

77a4c85

Misc renames.

e321ba9

Allocate HIR Forest on arena.

1e12f39

Clean up E0080 long explanation

38f9cd4

Dylan-DPC and others added 19 commits November 28, 2019 01:26

Update CONTRIBUTING.md

77f2ac4

Clarify {f32,f64}::EPSILON docs

85a468b

rustc: move MIR source_scope_local_data's ClearCrossCrate to be aroun…

fd40d0c

…d elements.

rustc_mir: fix inliner to also copy over source_scope_local_data.

314f8d5

rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.

3aead85

do not consider memory allocated by caller_location leaked

3048d7e

allow customising ty::TraitRef's printing behavior

f07bd06

fix clippy allow customising ty::TraitRef's printing behavior fix clippy stylistic fix

Minor documentation fix

26e5fd4

Fixed the documentation for any as is a trait rather than a type.

Rollup merge of rust-lang#66379 - CreepySkeleton:patch-1, r=RalfJung

54a3aa8

Rephrase docs in for ptr These methods can be supplied with NULL just fine, this is the whole point of `Option<&T>` return type.

Rollup merge of rust-lang#66808 - GuillaumeGomez:cleanup-err-code-3, …

45eacba

…r=Dylan-DPC Cleanup error code r? @Dylan-DPC

Rollup merge of rust-lang#66844 - RalfJung:caller-location-leak, r=ol…

d2aed25

…i-obk Miri: do not consider memory allocated by caller_location leaked Fixes rust-lang/miri#1071 r? @oli-obk I am not sure if this is the best approach, but it certainly is the easiest.

Rollup merge of rust-lang#66872 - Mikotochan:patch-1, r=jonas-schievink

7d0b1ab

Minor documentation fix Fixed the documentation for any as is a trait rather than a type.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 29, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 29, 2019

RalfJung closed this Nov 29, 2019

RalfJung deleted the rollup-401x5k8 branch November 30, 2019 07:50

JohnTitor added the rollup A PR which is a rollup label Dec 5, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 11 pull requests #66875

Rollup of 11 pull requests #66875

RalfJung commented Nov 29, 2019

RalfJung commented Nov 29, 2019

bors commented Nov 29, 2019

bors commented Nov 29, 2019

bors commented Nov 29, 2019

RalfJung commented Nov 29, 2019

Rollup of 11 pull requests #66875

Rollup of 11 pull requests #66875

Conversation

RalfJung commented Nov 29, 2019

RalfJung commented Nov 29, 2019

bors commented Nov 29, 2019

bors commented Nov 29, 2019

bors commented Nov 29, 2019

RalfJung commented Nov 29, 2019