Skip to content

Rollup of 4 pull requests - #64804

Closed
Centril wants to merge 34 commits into
rust-lang:masterfrom
Centril:rollup-3gv3i7x
Closed

Rollup of 4 pull requests#64804
Centril wants to merge 34 commits into
rust-lang:masterfrom
Centril:rollup-3gv3i7x

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

arielb1and others added 30 commits September 24, 2019 21:11
this is necessary for never-type stabilization
The non-global context was removed; there's only one context now. This
is a noop method that only serves to confuse readers -- remove it.
There's no longer two distinct gcx and tcx lifetimes which made this
necessary (or, at least, the code compiles -- it's possible we got
better at normalizing, but that seems unlikely).
Fuchsia exit codes don't follow the convention of libc::WEXITSTATUS et
al, and they are 64 bits instead of 32 bits. This gives Fuchsia its own
representation of ExitStatus.
Additionally, the zircon syscall structs were out of date, causing us to
see bogus return codes.
reserve `impl<T> From<!> for T`
this is necessary for never-type stabilization.
cc rust-lang#57012rust-lang#35121
I think we wanted a crater run for this @nikomatsakis?
r? @nikomatsakis
…hewjasper
Rust 2015: No longer downgrade NLL errors
As per decision on a language team meeting as described in rust-lang#63565 (comment), in Rust 2015, we refuse to downgrade NLL errors, that AST borrowck accepts, into warnings and keep them as hard errors.
The remaining work to throw out AST borrowck and adjust some tests still remains after this PR.
Fixesrust-lang#38899Fixesrust-lang#53432Fixesrust-lang#45157Fixesrust-lang#31567Fixesrust-lang#27868Fixesrust-lang#47366
r? @matthewjasper
Fix ExitStatus on Fuchsia
Fuchsia exit codes don't follow the convention of libc::WEXITSTATUS et
al, and they are 64 bits instead of 32 bits. This gives Fuchsia its own
representation of ExitStatus.
Additionally, the zircon syscall structs were out of date, causing us to
see bogus exit codes.
r? @cramertj@alexcrichton
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4 rollup=never

@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit e9843f9 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 26, 2019
@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

🔒 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:

  1. git checkout rollup-3gv3i7x(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-3gv3i7x --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
Removing src/tools/cargotest/lockfiles/iron-Cargo.lock
Removing src/test/ui/thread-local-in-ctfe.nll.stderr
Removing src/test/ui/pattern/pattern-bindings-after-at.nll.stderr
Removing src/test/ui/issues/issue-49824.nll.stderr
Removing src/test/ui/issues/issue-45696-scribble-on-boxed-borrow.migrate.stderr
Auto-merging src/test/ui/issues/issue-40510-3.stderr
Removing src/test/ui/issues/issue-40510-3.nll.stderr
Auto-merging src/test/ui/issues/issue-40510-1.stderr
Removing src/test/ui/issues/issue-40510-1.nll.stderr
Removing src/test/ui/consts/min_const_fn/min_const_fn_dyn.nll.stderr
Removing src/test/ui/consts/min_const_fn/min_const_fn.nll.stderr
Removing src/test/ui/borrowck/borrowck-migrate-to-nll.zflag.stderr
Removing src/test/ui/borrowck/borrowck-migrate-to-nll.rs
Removing src/test/ui/borrowck/borrowck-migrate-to-nll.edition.stderr
Removing src/test/ui/borrowck/borrowck-describe-lvalue.nll.stderr
Removing src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr
Auto-merging src/librustdoc/clean/mod.rs
Auto-merging src/librustc_typeck/collect.rs
Auto-merging src/librustc_typeck/coherence/builtin.rs
Auto-merging src/librustc_typeck/check/wfcheck.rs
Auto-merging src/librustc_typeck/check/expr.rs
Auto-merging src/librustc_typeck/astconv.rs
Auto-merging src/librustc_traits/chalk_context/mod.rs
Auto-merging src/librustc_mir/shim.rs
Auto-merging src/librustc_mir/hair/cx/expr.rs
Auto-merging src/librustc_mir/dataflow/drop_flag_effects.rs
Auto-merging src/librustc_mir/borrow_check/nll/universal_regions.rs
Auto-merging src/librustc_mir/borrow_check/nll/type_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/conflict_errors.rs
Auto-merging src/librustc_metadata/encoder.rs
Auto-merging src/librustc/ty/print/pretty.rs
Auto-merging src/librustc/ty/mod.rs
Auto-merging src/librustc/ty/layout.rs
Auto-merging src/librustc/ty/instance.rs
Auto-merging src/librustc/ty/error.rs
Auto-merging src/librustc/ty/context.rs
Auto-merging src/librustc/traits/specialize/specialization_graph.rs
Auto-merging src/librustc/traits/select.rs
Auto-merging src/librustc/traits/query/normalize.rs
Auto-merging src/librustc/traits/query/dropck_outlives.rs
Auto-merging src/librustc/traits/fulfill.rs
Auto-merging src/librustc/traits/error_reporting.rs
Auto-merging src/librustc/traits/auto_trait.rs
Auto-merging src/librustc/middle/mem_categorization.rs
Auto-merging src/librustc/middle/intrinsicck.rs
CONFLICT (content): Merge conflict in src/librustc/middle/intrinsicck.rs
Auto-merging src/librustc/infer/opaque_types/mod.rs
Auto-merging src/librustc/infer/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@borsbors 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 Sep 26, 2019
@bors

bors commented Sep 26, 2019

Copy link
Copy Markdown
Collaborator

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

@CentrilCentril closed this Sep 26, 2019
@Centril
Centril deleted the rollup-3gv3i7x branch September 26, 2019 15:03
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@Centril@bors@arielb1@nikomatsakis@Mark-Simulacrum@tmandry