Rollup of 19 pull requests #57309

Mark-Simulacrum · 2019-01-03T18:40:36Z

Successful merges:

Allow to dispatch fn traits depending on number of parameters #55986 (Allow to dispatch fn traits depending on number of parameters)
Implement the Re-rebalance coherence RFC #56145 (Implement the Re-rebalance coherence RFC)
Don't emit Unevaluated from const_eval #56723 (Don't emit Unevaluated from const_eval)
make panictry! private to libsyntax #56897 (make panictry! private to libsyntax)
NLL: Add closure cannot be moved note. #57099 (NLL: Add closure cannot be moved note.)
Search codegen backends based on target libdir instead of sysroot #57101 (Search codegen backends based on target libdir instead of sysroot)
panic when calling MaybeUninhabited::into_inner on uninhabited type #57145 (panic when calling MaybeUninhabited::into_inner on uninhabited type)
Remove some unused code #57219 (Remove some unused code)
Rename and fix nolink-with-link-args test #57233 (Rename and fix nolink-with-link-args test)
Fix backtraces for inlined functions on Windows #57238 (Fix backtraces for inlined functions on Windows)
Fix broken links to second edition TRPL. #57249 (Fix broken links to second edition TRPL.)
Update reference of rlibc crate to compiler-builtins crate #57259 (Update reference of rlibc crate to compiler-builtins crate)
src/jemalloc is gone, remove its mention from COPYRIGHT #57267 (src/jemalloc is gone, remove its mention from COPYRIGHT)
Make sure feature gate errors are recoverable (take 2) #57272 (Make sure feature gate errors are recoverable (take 2))
Update the stdsimd submodule #57273 (Update the stdsimd submodule)
Update compiler_builtins 0.1.2 -> 0.1.3 #57275 (Update compiler_builtins 0.1.2 -> 0.1.3)
Add Clippy to config.toml.example #57278 (Add Clippy to config.toml.example)
bootstrap: Link LLVM as a dylib with ThinLTO (take 2) #57286 (bootstrap: Link LLVM as a dylib with ThinLTO (take 2))
Fix 'be be' constructs #57295 (Fix 'be be' constructs)

Failed merges:

submodules: update clippy and rls #57303 (submodules: update clippy and rls)

Fixes cases with custom libdir when it consists of two or more parts.

This commit extends existing logic for checking whether a closure that is `FnOnce` and therefore moves variables that it captures from the environment has already been invoked when being invoked again. Now, this logic will also check whether the closure is being moved after previously being moved or invoked and add an appropriate note.

The types are no longer used with the change to stacked borrows for validation.

Those tests are directly taken from the comments on the bug reports.

When resolving Fn traits, the compiler failed to take into account overloaded implementations. To resolve this, we inform the trait dispatch code that the arguments will becoming as a tuple of correct arity.

This allows to verify that we handle different types as return types, and that we call the expected functions.

This copies and adjusts the existing coherence tests to ensure that they continue to work using the new implementation.

…ence.md Co-Authored-By: weiznich <[email protected]>

uncoverd type

Implement compile tests as variants of existing tests

There are three problems with the nolink-with-link-args test: * The test fails when using MSVC. It's caused by the `linker-flavor=ld` flag which was added in rust-lang#46291. * In its comment, this test tests that "link_args are indeed passed when nolink is specified", but the `nolink` attribute has been removed [a long time ago](rust-lang#12826). * Pattern has a small typo. At first I was going to completely remove this test, but there is [a closed pull request for that](rust-lang#21090). So: * rename the file as suggested in the closed PR * adjust the comment * fix typo in the pattern * add `ignore-msvc`.

Fixes rust-lang#57104.

@eddyb

Allow to dispatch fn traits depending on number of parameters Hello, By following @eddyb's advise on issue rust-lang#45510, I managed to have the snippets of code in rust-lang#45510 and rust-lang#18952 passing without breaking older diagnostics. EDIT: the codegen tests breakage I experienced is due to the poor quality of my laptop. If any kind reviewer has any advice, you are very welcome.

@sgrif

…nikomatsakis Implement the Re-rebalance coherence RFC This is the first time I touch anything in the compiler so just tell me if I got something wrong. Big thanks to @sgrif for the pointers where to look for those things. cc rust-lang#55437

@eddyb

Don't emit `Unevaluated` from `const_eval` cc @eddyb @RalfJung

make `panictry!` private to libsyntax This commit completely removes usage of the `panictry!` macro from outside libsyntax. The macro causes parse errors to be fatal, so using it in libsyntax_ext caused parse failures *within* a syntax extension to be fatal, which is probably not intended. Furthermore, this commit adds spans to diagnostics emitted by empty extensions if they were missing, à la rust-lang#56491.

@pnkfelix

NLL: Add closure cannot be moved note. Fixes rust-lang#57098. This PR extends existing logic for checking whether a closure that is `FnOnce` and therefore moves variables that it captures from the environment has already been invoked when being invoked again. Now, this logic will also check whether the closure is being moved after previously being moved or invoked and add an appropriate note. r? @pnkfelix

Search codegen backends based on target libdir instead of sysroot Fixes rust-lang#57014 Fixes cases with custom libdir when it consists of two or more parts.

…excrichton panic when calling MaybeUninhabited::into_inner on uninhabited type I do this by adding an internal-only intrinsic `panic_if_uninhabited`. I have no idea what I am doing here, just mindlessly copying code around, so please review carefully!

…tsakis Remove some unused code Closes rust-lang#57096

@alexcrichton

…=alexcrichton Rename and fix nolink-with-link-args test There are three problems with the nolink-with-link-args test: * The test fails when using MSVC. It's caused by the `linker-flavor=ld` flag which was added in rust-lang#46291. * In its comment, this test tests that "link_args are indeed passed when nolink is specified", but the `nolink` attribute has been removed [a long time ago](rust-lang#12826). * Pattern has a small typo. At first I was going to completely remove this test, but there is [a closed pull request for that](rust-lang#21090). So: * rename the file as suggested in the closed PR * adjust the comment * fix typo in the pattern * add `ignore-msvc`. r? @alexcrichton

@alexcrichton

Fix backtraces for inlined functions on Windows Fixes an regression introduced in rust-lang#50526 r? @alexcrichton

…=KodrAus Fix broken links to second edition TRPL. Fixes rust-lang#57104. Remove `second-edition/` from TRPL hyperlinks.

Update reference of rlibc crate to compiler-builtins crate None

src/jemalloc is gone, remove its mention from COPYRIGHT The `src/jemalloc` submodule was removed in 61e8944 / rust-lang#55238.

Make sure feature gate errors are recoverable (take 2) Continuation of rust-lang@15cefe4. Turns out I missed the most important part - the main feature gate checking pass.

…matsakis Update the stdsimd submodule Add a new cmpxchg16b intrinsics for x86_64 and some corrections for ARM/AArch64

@alexcrichton

…s, r=alexcrichton Update compiler_builtins 0.1.2 -> 0.1.3 r? @alexcrichton

Add Clippy to config.toml.example Omitted in rust-lang#51122 The order is based on https://github.com/rust-lang/rust/blob/ec194646fef1a467073ad74b8b68f6f202cfce97/src/bootstrap/install.rs#L212

…atsakis bootstrap: Link LLVM as a dylib with ThinLTO (take 2) When building a distributed compiler on Linux where we use ThinLTO to create the LLVM shared object this commit switches the compiler to dynamically linking that LLVM artifact instead of statically linking to LLVM. The primary goal here is to reduce CI compile times, avoiding two+ ThinLTO builds of all of LLVM. By linking dynamically to LLVM we'll reuse the one ThinLTO step done by LLVM's build itself. Lots of discussion about this change can be found [here] and down. A perf run will show whether this is worth it or not! [here]: rust-lang#53245 (comment) --- This PR previously landed in rust-lang#56944, caused rust-lang#57111, and was reverted in rust-lang#57116. I've added one more commit here which should fix the breakage that we saw.

Fix 'be be' constructs I noticed a duplicated "be" somewhere in the code. A search for it manifested a couple more locations with the same problem. This change removes one of the "be"s.

Mark-Simulacrum · 2019-01-03T18:41:01Z

@bors r+ p=5

bors · 2019-01-03T18:41:03Z

📌 Commit 6adc37e has been approved by Mark-Simulacrum

pietroalbini · 2019-01-03T19:23:36Z

First rollup of the year 😿

bors · 2019-01-03T20:27:41Z

🔒 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 (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 --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/test/ui/coherence/coherence_local_err_tuple.old.stderr
Auto-merging src/test/ui/coherence/coherence_local_err_struct.old.stderr
Auto-merging src/test/ui/coherence/coherence_inherent_cc.old.stderr
Auto-merging src/test/ui/coherence/coherence_inherent.old.stderr
Auto-merging src/test/ui/coherence/coherence_copy_like_err_tuple.old.stderr
Auto-merging src/test/ui/coherence/coherence_copy_like_err_struct.old.stderr
Auto-merging src/test/ui/coherence/coherence_copy_like_err_fundamental_struct_tuple.old.stderr
Auto-merging src/test/ui/coherence/coherence-vec-local.old.stderr
Auto-merging src/test/ui/coherence/coherence-vec-local-2.old.stderr
Auto-merging src/test/ui/coherence/coherence-tuple-conflict.old.stderr
Auto-merging src/test/ui/coherence/coherence-projection-conflict.old.stderr
Auto-merging src/test/ui/coherence/coherence-projection-conflict-ty-param.old.stderr
Auto-merging src/test/ui/coherence/coherence-projection-conflict-orphan.old.stderr
Auto-merging src/test/ui/coherence/coherence-pair-covered-uncovered.old.stderr
Auto-merging src/test/ui/coherence/coherence-pair-covered-uncovered-1.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlapping-pairs.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-upstream.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-upstream-inherent.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-messages.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-issue-23516.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-issue-23516-inherent.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-downstream.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-downstream-inherent.old.stderr
Auto-merging src/test/ui/coherence/coherence-overlap-all-t-and-tuple.old.stderr
Auto-merging src/test/ui/coherence/coherence-orphan.old.stderr
Auto-merging src/test/ui/coherence/coherence-no-direct-lifetime-dispatch.old.stderr
Auto-merging src/test/ui/coherence/coherence-negative-impls-safe.old.stderr
Auto-merging src/test/ui/coherence/coherence-lone-type-parameter.old.stderr
Auto-merging src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.old.stderr
Auto-merging src/test/ui/coherence/coherence-impls-sized.old.stderr
Auto-merging src/test/ui/coherence/coherence-impls-send.old.stderr
Auto-merging src/test/ui/coherence/coherence-impls-copy.old.stderr
Auto-merging src/test/ui/coherence/coherence-impl-trait-for-trait.old.stderr
Auto-merging src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.old.stderr
Auto-merging src/test/ui/coherence/coherence-error-suppression.old.stderr
Auto-merging src/test/ui/coherence/coherence-default-trait-impl.old.stderr
Auto-merging src/test/ui/coherence/coherence-cross-crate-conflict.old.stderr
Auto-merging src/test/ui/coherence/coherence-conflicting-negative-trait-impl.old.stderr
Auto-merging src/test/ui/coherence/coherence-blanket-conflicts-with-specific.old.stderr
Auto-merging src/test/ui/coherence/coherence-blanket-conflicts-with-specific-trait.old.stderr
Auto-merging src/test/ui/coherence/coherence-blanket-conflicts-with-specific-multidispatch.old.stderr
Auto-merging src/test/ui/coherence/coherence-blanket-conflicts-with-specific-cross-crate.old.stderr
Auto-merging src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-unimplemented.old.stderr
Auto-merging src/test/ui/coherence/coherence-blanket-conflicts-with-blanket-implemented.old.stderr
Auto-merging src/test/ui/coherence/coherence-bigint-param.old.stderr
Auto-merging src/test/ui/coherence/coherence-all-remote.old.stderr
CONFLICT (modify/delete): src/test/run-pass/coherence/coherence-subtyping.rs deleted in HEAD and modified in heads/homu-tmp. Version heads/homu-tmp of src/test/run-pass/coherence/coherence-subtyping.rs left in tree.
Removing src/test/run-make-fulldeps/llvm-pass/plugin.rs
Removing src/test/run-make-fulldeps/llvm-pass/main.rs
Removing src/test/run-make-fulldeps/llvm-pass/llvm-module-pass.so.cc
Removing src/test/run-make-fulldeps/llvm-pass/llvm-function-pass.so.cc
Removing src/test/run-make-fulldeps/llvm-pass/Makefile
Removing src/test/compile-fail/nolink-with-link-args.rs
Auto-merging src/librustc_mir/shim.rs
Auto-merging src/librustc_mir/hair/cx/mod.rs
Auto-merging src/librustc_mir/build/misc.rs
Auto-merging src/librustc_mir/borrow_check/nll/type_check/mod.rs
Auto-merging src/librustc_mir/borrow_check/error_reporting.rs
Auto-merging src/librustc/util/ppaux.rs
Auto-merging src/librustc/ty/sty.rs
Auto-merging src/librustc/ty/structural_impls.rs
Auto-merging src/librustc/ty/error.rs
Auto-merging src/librustc/traits/project.rs
Auto-merging src/librustc/traits/error_reporting.rs
Auto-merging src/librustc/traits/coherence.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2019-01-03T20:40:06Z

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

o01eg and others added 30 commits December 24, 2018 18:52

Search codegen backends based on target libdir instead of sysroot.

4e7d53d

Fixes cases with custom libdir when it consists of two or more parts.

panic when calling MaybeUninhabited::into_inner on uninhabited type

fff905b

use a better way to get at the type parameter

c118b17

Remove unnecessary borrow generation

2149d73

Remove unused types from rustc::mir::interpret

49e52e7

The types are no longer used with the change to stacked borrows for validation.

test: Add test for issues 45510 and 18952.

4e77c3a

Those tests are directly taken from the comments on the bug reports.

rustfmt: librust_typeck/check/callee.rs

6de9c13

rustc_typeck: Implement resolution advised in issue 45510.

1827d52

When resolving Fn traits, the compiler failed to take into account overloaded implementations. To resolve this, we inform the trait dispatch code that the arguments will becoming as a tuple of correct arity.

Move tests to ui.

f518cf9

Fix failing diagnostic test.

2f42a18

Add comment.

2530ce9

Change return types and check return values in tests.

91c155b

This allows to verify that we handle different types as return types, and that we call the expected functions.

Remove unused nll debug flags

afb7c06

Implement the re-rebalance coherence rfc

3512a72

Add some tests

b8ee6fa

This copies and adjusts the existing coherence tests to ensure that they continue to work using the new implementation.

Add some docs about the new feature to the unstable book

e869e5f

Fix tidy

cae96b1

Update src/doc/unstable-book/src/language-features/re-rebalance-coher…

eee09d5

…ence.md Co-Authored-By: weiznich <[email protected]>

Directly check if input_ty is a type parameter and therefore a

6912b2d

uncoverd type

Fix failing compile tests

44089c8

Update some new tests to changed error messages

ad7d015

Unify tests

8a5d45d

Implement compile tests as variants of existing tests

Fix typo

da08a81

Add missing files

6caa4ce

Fix backtraces on Windows

f4826ab

Fix broken links to second edition TRPL.

d2c91a1

Fixes rust-lang#57104.

Move the Unevaluated constant arm upwards in the type structure

b903cb9

Mingw is special wrt type sizes

88df3a2

weiznich and others added 20 commits January 3, 2019 13:25

More test deduplication

32118a9

Rollup merge of rust-lang#56723 - oli-obk:lazy_const, r=nikomatsakis

fee93ea

Don't emit `Unevaluated` from `const_eval` cc @eddyb @RalfJung

Rollup merge of rust-lang#57101 - o01eg:fix-57014, r=alexcrichton

4473e32

Search codegen backends based on target libdir instead of sysroot Fixes rust-lang#57014 Fixes cases with custom libdir when it consists of two or more parts.

Rollup merge of rust-lang#57219 - matthewjasper:mir-cleanup, r=nikoma…

88818d6

…tsakis Remove some unused code Closes rust-lang#57096

Rollup merge of rust-lang#57238 - Zoxc:bt-fix, r=alexcrichton

400d453

Fix backtraces for inlined functions on Windows Fixes an regression introduced in rust-lang#50526 r? @alexcrichton

Rollup merge of rust-lang#57249 - frewsxcv:frewsxcv-second-edition, r…

028774c

…=KodrAus Fix broken links to second edition TRPL. Fixes rust-lang#57104. Remove `second-edition/` from TRPL hyperlinks.

Rollup merge of rust-lang#57259 - king6cong:master, r=alexcrichton

e78b596

Update reference of rlibc crate to compiler-builtins crate None

Rollup merge of rust-lang#57267 - rust-lang:SimonSapin-patch-1, r=varkor

0496b18

src/jemalloc is gone, remove its mention from COPYRIGHT The `src/jemalloc` submodule was removed in 61e8944 / rust-lang#55238.

Rollup merge of rust-lang#57272 - petrochenkov:featrecov, r=estebank

f05bd30

Make sure feature gate errors are recoverable (take 2) Continuation of rust-lang@15cefe4. Turns out I missed the most important part - the main feature gate checking pass.

Rollup merge of rust-lang#57273 - alexcrichton:update-stdsimd, r=niko…

cf56d3f

…matsakis Update the stdsimd submodule Add a new cmpxchg16b intrinsics for x86_64 and some corrections for ARM/AArch64

Rollup merge of rust-lang#57275 - jethrogb:jb/update-compiler_builtin…

6e80fb1

…s, r=alexcrichton Update compiler_builtins 0.1.2 -> 0.1.3 r? @alexcrichton

Rollup merge of rust-lang#57278 - mati865:config_clippy, r=alexcrichton

e8472e4

Add Clippy to config.toml.example Omitted in rust-lang#51122 The order is based on https://github.com/rust-lang/rust/blob/ec194646fef1a467073ad74b8b68f6f202cfce97/src/bootstrap/install.rs#L212

Rollup merge of rust-lang#57295 - d-e-s-o:topic/be-be, r=zackmdavis

6adc37e

Fix 'be be' constructs I noticed a duplicated "be" somewhere in the code. A search for it manifested a couple more locations with the same problem. This change removes one of the "be"s.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 3, 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 Jan 3, 2019

Mark-Simulacrum closed this Jan 3, 2019

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 19 pull requests #57309

Rollup of 19 pull requests #57309

Mark-Simulacrum commented Jan 3, 2019

Mark-Simulacrum commented Jan 3, 2019

bors commented Jan 3, 2019

pietroalbini commented Jan 3, 2019

bors commented Jan 3, 2019

bors commented Jan 3, 2019

Rollup of 19 pull requests #57309

Rollup of 19 pull requests #57309

Conversation

Mark-Simulacrum commented Jan 3, 2019

Mark-Simulacrum commented Jan 3, 2019

bors commented Jan 3, 2019

pietroalbini commented Jan 3, 2019

bors commented Jan 3, 2019

bors commented Jan 3, 2019