New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closure bounds fixes #58347

Merged
merged 3 commits into from Feb 14, 2019

Conversation

Projects
None yet
5 participants
@matthewjasper
Copy link
Contributor

matthewjasper commented Feb 10, 2019

  • Ensures that "nice region errors" are buffered so that they are sorted and migrated correctly.
  • Propagates fewer constraints for closures (cc #58178)
  • Propagate constraints from closures more precisely (#58127)

Closes #58127

r? @nikomatsakis

@@ -59,7 +60,7 @@ impl<'cx, 'gcx, 'tcx> NiceRegionError<'cx, 'gcx, 'tcx> {
self.infcx.tcx
}

pub fn try_report_from_nll(&self) -> Option<ErrorReported> {
pub fn try_report_from_nll(&self) -> Option<DiagnosticBuilder<'cx>> {

This comment has been minimized.

@pnkfelix

pnkfelix Feb 11, 2019

Member

this (and the corresponding changes to make diagnostic construction lazy here) was smart

@pnkfelix

This comment has been minimized.

Copy link
Member

pnkfelix commented Feb 11, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 11, 2019

📌 Commit 2547c2c has been approved by pnkfelix

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 12, 2019

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

@matthewjasper matthewjasper force-pushed the matthewjasper:closure-bounds-fixes branch from 2547c2c to 5ebb4e7 Feb 13, 2019

@matthewjasper

This comment has been minimized.

Copy link
Contributor Author

matthewjasper commented Feb 13, 2019

@bors r=pnkfelix

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 13, 2019

📌 Commit 5ebb4e7 has been approved by pnkfelix

@rust-highfive

This comment was marked as outdated.

Copy link
Collaborator

rust-highfive commented Feb 13, 2019

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:119264d0:start=1550085500473504717,finish=1550085502548846121,duration=2075341404
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:07:58] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--features" "" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--message-format" "json"
[00:07:58] expected success, got: exit code: 101
[00:07:58] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:07:58] Build completed unsuccessfully in 0:03:54
[00:07:58] Makefile:18: recipe for target 'all' failed
[00:07:58] make: *** [all] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:09071454
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Feb 13 19:26:30 UTC 2019
---
travis_time:end:0f6b86ee:start=1550085991428427821,finish=1550085991433046944,duration=4619123
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:035e973a
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0f503720
travis_time:start:0f503720
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:324da452
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@matthewjasper matthewjasper force-pushed the matthewjasper:closure-bounds-fixes branch from 5ebb4e7 to 79e8c31 Feb 13, 2019

@matthewjasper

This comment has been minimized.

Copy link
Contributor Author

matthewjasper commented Feb 13, 2019

@bors r=pnkfelix

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 13, 2019

📌 Commit 79e8c31 has been approved by pnkfelix

Centril added a commit to Centril/rust that referenced this pull request Feb 14, 2019

Rollup merge of rust-lang#58347 - matthewjasper:closure-bounds-fixes,…
… r=pnkfelix

Closure bounds fixes

* Ensures that "nice region errors" are buffered so that they are sorted and migrated correctly.
* Propagates fewer constraints for closures (cc rust-lang#58178)
* Propagate constraints from closures more precisely (rust-lang#58127)

Closes rust-lang#58127

r? @nikomatsakis

Centril added a commit to Centril/rust that referenced this pull request Feb 14, 2019

Rollup merge of rust-lang#58347 - matthewjasper:closure-bounds-fixes,…
… r=pnkfelix

Closure bounds fixes

* Ensures that "nice region errors" are buffered so that they are sorted and migrated correctly.
* Propagates fewer constraints for closures (cc rust-lang#58178)
* Propagate constraints from closures more precisely (rust-lang#58127)

Closes rust-lang#58127

r? @nikomatsakis

bors added a commit that referenced this pull request Feb 14, 2019

Auto merge of #58455 - Centril:rollup, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #58309 (Add more profiler events)
 - #58347 (Closure bounds fixes)
 - #58365 (Add an option to print the status of incremental tasks / dep nodes after running them)
 - #58371 (Check user type annotations for range patterns.)
 - #58378 (rustc: Implement incremental "fat" LTO)
 - #58407 (specify "upper camel case" in style lint)
 - #58449 (Notify @topecongiro when the state of rustfmt has changed)

Failed merges:

r? @ghost

@bors bors merged commit 79e8c31 into rust-lang:master Feb 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment