Sync upstream #95

vext01 · 2020-03-20T16:55:21Z

An inoffensive sync with upstream.

…ting.

…r::outlives.

submodules: update clippy from 329923e to fdce47b Changes: ```` add CR feedback Improve documentation Use `edition:2018` flag more widely Update tests/ui/needless_doc_main.rs Move links to the end of each chapter on adding_lints Move links to the end of each chapter on CONTRIBUTING Clean-up adding_lints.md Clean-up CONTRIBUTING.md needless_doc_main: only check rust code Use `node_type_opt` over `node_type` Fix doc Fix ICE with trivial_bounds feature clippy_lints: readme: don't mention crates.io since it is no longer used to publish clippy. update rust-lang.github.io to rustc-dev-guide.rust-lang.org Improve placeholder in map_unit_fn Fix match single binding when in a let stmt Improve error messages for {option,result}_map_unit_fn Mention the setup instructions in CONTRIBUTING redundant_pattern: take binding (ref, ref mut) into account in suggestion. check_pat: delay creation of the "normal" vec until we reach the branch where is is actually needed deps: bump itertools 0.8 -> 0.9 add lint on File::read_to_string and File::read_to_end transition rustc-guide to rustc-dev-guide Rename macro_use_import -> macro_use_imports warn on macro_use attr Fix deploy script for tag deploys ```` Fixes rust-lang#69957

@eddyb

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

@oli-obk

adjust Miri to needs of changed unwinding strategy As expected, rust-lang/rust#67502 broke unwinding in Miri. To fix it we have to adjust parts of the engine and the panic runtime, which this PR does. The Miri-side changes are in rust-lang/miri#1227. Cc @oli-obk @Aaron1011 @Mark-Simulacrum @Amanieu

Fixes #70001

vext01 · 2020-03-21T10:34:52Z

bors try

bors · 2020-03-21T10:39:03Z

try

Build failed

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-03-22T16:36:39Z

bors try

bors · 2020-03-22T16:59:01Z

try

Build failed

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-03-22T19:47:24Z

error: internal compiler error: cannot lex source_file without source: /home/buildbot-worker8/.cargo/registry/src/github.tiyicn.workers.dev-1ecc6299db9ec823/ppv-lite86-0.2.6/src/x86_64/mod.rs

bjorn3 · 2020-03-22T19:58:41Z

That is rust-lang/rust#69933, which was fixed by rust-lang/rust#70172.

vext01 · 2020-03-22T20:00:22Z

That is rust-lang/rust#69933, which was fixed by rust-lang/rust#70172.

Thanks! I'll re-sync tomorrow.

vext01 · 2020-03-23T11:12:52Z

bors try

…les.

bors · 2020-03-23T11:46:51Z

try

Build succeeded

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-03-23T11:51:15Z

Right, good. I've used git --rebase-merges to put that commit that I cherry-picked inside the merge commit. I also squashed the lock update into the merge.

Sound good? If so I will force-push.

(It was not easy...)

ltratt · 2020-03-23T11:52:43Z

Since Lukas was already happy with this, please force push.

vext01 · 2020-03-23T11:53:48Z

There we go. Fingers crossed.

ltratt · 2020-03-23T11:55:08Z

bors r+

95: Sync upstream r=ltratt a=vext01 An inoffensive sync with upstream. Co-authored-by: Ralf Jung <[email protected]> Co-authored-by: Jonas Schievink <[email protected]> Co-authored-by: Camille GILLOT <[email protected]> Co-authored-by: bors <[email protected]> Co-authored-by: Vadim Petrochenkov <[email protected]> Co-authored-by: Guillaume Gomez <[email protected]> Co-authored-by: Amanieu d'Antras <[email protected]> Co-authored-by: John Kåre Alsaker <[email protected]>

bors · 2020-03-23T12:21:47Z

Build failed

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-03-23T13:29:56Z

I missed a bit. Can I squash it in?

ptersilie · 2020-03-23T13:34:48Z

Looks good to me.

…nc-upstream-20200320

vext01 · 2020-03-23T13:46:41Z

splat.

ptersilie · 2020-03-23T13:47:04Z

bors r+

bors · 2020-03-23T14:21:38Z

Build succeeded

buildbot/ykrustc-buildbot-build-script-hwt

vext01 · 2020-03-23T14:21:56Z

Yay :)

RalfJung and others added 30 commits March 14, 2020 11:51

adjust Miri to needs of changed unwinding strategy

b5938ad

fix comment, rustfmt

b450e1b

Use smaller discriminants for generators

b2779d8

Add a test for generator discriminants

4266807

Move IntercrateAmbiguityCause back to rustc::traits::select.

3e5259d

Move opaque_types::unexpected_hidden_region_diagnostic to error_repor…

98444ca

…ting.

Fix rebase fallout

49aabd8

Move traits::query::outlives_bounds::explicit_outlives_bounds to infe…

796ca64

…r::outlives.

Mode ProjectionCache to its own module.

21d4e06

Move rustc_infer::traits to new crate rustc_trait_selection.

c1e3d55

Split librustc_infer.

0535dd3

Make downstream crates compile.

1fcdc52

Trim dependencies and features.

0144a97

Swap inserts to keep the original ordering

38fa378

resolve: Fix regression in resolution of raw keywords in paths

e80cb20

Auto merge of #69076 - cjgillot:split_trait, r=matthewjasper

131772c

Split librustc::{traits,infer} to their respective crates Followup on #67953. I tried to follow the existing module structures. cc @eddyb r? @Zoxc

Make ignore and compile fail signs more visible

d4ea327

remove compilation warning

8216a32

Add a workaround for catch_unwind in stage1 mingw target

864d05b

Fixes #70001

Add HIR queries

cfa1d4e

Collect the new maps

21386e1

Create Map after TyCtxt

518c78f

Update item functions

e1a9626

Update fn_decl_by_hir_id and fn_sig_by_hir_id

d3c7394

Update body_owner and maybe_body_owned_by

0c68b7a

Update krate_attrs and get_module

38e613c

Update visit_item_likes_in_module

b40e6ba

Update get_parent_node

d5827d8

bors bot added a commit that referenced this pull request Mar 21, 2020

Try #95:

af6b6a6

bors bot added a commit that referenced this pull request Mar 22, 2020

Try #95:

06652b0

bors bot added a commit that referenced this pull request Mar 23, 2020

Try #95:

2a27de3

parse/lexer: support StringReader::retokenize called on external fi…

df7964f

…les.

vext01 force-pushed the yk-sync-upstream-20200320 branch from 14905b2 to b979dde Compare March 23, 2020 11:53

Merge branch 'master' of https://github.com/rust-lang/rust into yk-sy…

9cc7be1

…nc-upstream-20200320

vext01 force-pushed the yk-sync-upstream-20200320 branch from ef021de to 9cc7be1 Compare March 23, 2020 13:46

bors bot merged commit 5e82020 into softdevteam:master Mar 23, 2020

vext01 deleted the yk-sync-upstream-20200320 branch March 23, 2020 14:21

Sync upstream #95

Sync upstream #95

Uh oh!

Conversation

vext01 commented Mar 20, 2020

Uh oh!

vext01 commented Mar 21, 2020

Uh oh!

bors bot commented Mar 21, 2020

try

Build failed

Uh oh!

vext01 commented Mar 22, 2020

Uh oh!

bors bot commented Mar 22, 2020

try

Build failed

Uh oh!

vext01 commented Mar 22, 2020

Uh oh!

bjorn3 commented Mar 22, 2020

Uh oh!

vext01 commented Mar 22, 2020

Uh oh!

vext01 commented Mar 23, 2020

Uh oh!

bors bot commented Mar 23, 2020

try

Build succeeded

Uh oh!

vext01 commented Mar 23, 2020

Uh oh!

ltratt commented Mar 23, 2020

Uh oh!

vext01 commented Mar 23, 2020

Uh oh!

ltratt commented Mar 23, 2020

Uh oh!

bors bot commented Mar 23, 2020

Build failed

Uh oh!

vext01 commented Mar 23, 2020

Uh oh!

ptersilie commented Mar 23, 2020

Uh oh!

vext01 commented Mar 23, 2020

Uh oh!

ptersilie commented Mar 23, 2020

Uh oh!

bors bot commented Mar 23, 2020

Build succeeded

Uh oh!

vext01 commented Mar 23, 2020

Uh oh!

Uh oh!