Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Remove ReClosureBound #70277

Merged
merged 1 commit into from
Mar 24, 2020
Merged

Remove ReClosureBound #70277

merged 1 commit into from
Mar 24, 2020

Conversation

matthewjasper
Copy link
Contributor

We now substitute external names for regions in the query response.

r? @nikomatsakis

@rust-highfive
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, 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. 
2020-03-22T16:30:37.5943979Z ========================== Starting Command Output ===========================
2020-03-22T16:30:37.5949436Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/c26fa20a-1899-441c-9d46-a8c3bf4cc28e.sh
2020-03-22T16:30:37.5949902Z 
2020-03-22T16:30:37.5954392Z ##[section]Finishing: Disable git automatic line ending conversion
2020-03-22T16:30:37.5971341Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70277/merge to s
2020-03-22T16:30:37.5974558Z Task         : Get sources
2020-03-22T16:30:37.5974812Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-22T16:30:37.5975056Z Version      : 1.0.0
2020-03-22T16:30:37.5975227Z Author       : Microsoft
---
2020-03-22T16:30:38.5855375Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-03-22T16:30:38.5861016Z ##[command]git config gc.auto 0
2020-03-22T16:30:38.5864928Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-03-22T16:30:38.5869049Z ##[command]git config --get-all http.proxy
2020-03-22T16:30:38.5875710Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/70277/merge:refs/remotes/pull/70277/merge
---
2020-03-22T16:40:31.8525969Z configure: build.locked-deps    := True
2020-03-22T16:40:31.8526475Z configure: llvm.ccache          := sccache
2020-03-22T16:40:31.8527174Z configure: build.cargo-native-static := True
2020-03-22T16:40:31.8527926Z configure: dist.missing-tools   := True
2020-03-22T16:40:31.8528804Z configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
2020-03-22T16:40:31.8529733Z configure: writing `config.toml` in current directory
2020-03-22T16:40:31.8530118Z configure: 
2020-03-22T16:40:31.8530757Z configure: run `python /checkout/x.py --help`
2020-03-22T16:40:31.8531179Z configure: 
---
2020-03-22T16:48:43.1189917Z skip untracked path cpu-usage.csv during rustfmt invocations
2020-03-22T16:48:43.1190811Z skip untracked path src/doc/book/ during rustfmt invocations
2020-03-22T16:48:43.1193903Z skip untracked path src/doc/rust-by-example/ during rustfmt invocations
2020-03-22T16:48:43.1197363Z skip untracked path src/llvm-project/ during rustfmt invocations
2020-03-22T16:48:43.3529746Z Diff in /checkout/src/librustc_trait_selection/opaque_types.rs at line 823:
2020-03-22T16:48:43.3530363Z              // The regions that we expect from borrow checking.
2020-03-22T16:48:43.3530957Z              ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReEmpty(ty::UniverseIndex::ROOT) => {}
2020-03-22T16:48:43.3532189Z -            ty::ReEmpty(_)
2020-03-22T16:48:43.3532921Z -            | ty::RePlaceholder(_)
2020-03-22T16:48:43.3533815Z -            | ty::ReVar(_)
2020-03-22T16:48:43.3534515Z -            | ty::ReScope(_) => {
2020-03-22T16:48:43.3534515Z -            | ty::ReScope(_) => {
2020-03-22T16:48:43.3535152Z +            ty::ReEmpty(_) | ty::RePlaceholder(_) | ty::ReVar(_) | ty::ReScope(_) => {
2020-03-22T16:48:43.3535768Z                  // All of the regions in the type should either have been
2020-03-22T16:48:43.3536343Z                  // erased by writeback, or mapped back to named regions by
2020-03-22T16:48:43.3536818Z                  // borrow checking.
2020-03-22T16:48:43.3549704Z Running `"/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/rustfmt" "--config-path" "/checkout" "--edition" "2018" "--unstable-features" "--skip-children" "--check" "/checkout/src/librustc_trait_selection/opaque_types.rs"` failed.
2020-03-22T16:48:43.3560285Z If you're running `tidy`, try again with `--bless` flag. Or, you just want to format code, run `./x.py fmt` instead.
2020-03-22T16:48:43.3568093Z Build completed unsuccessfully in 0:00:37
2020-03-22T16:48:43.3614540Z == clock drift check ==
2020-03-22T16:48:43.3626742Z   local time: Sun Mar 22 16:48:43 UTC 2020
2020-03-22T16:48:43.9089008Z   network time: Sun, 22 Mar 2020 16:48:43 GMT
2020-03-22T16:48:43.9089008Z   network time: Sun, 22 Mar 2020 16:48:43 GMT
2020-03-22T16:48:43.9089380Z == end clock drift check ==
2020-03-22T16:48:45.5804348Z 
2020-03-22T16:48:45.5896919Z ##[error]Bash exited with code '1'.
2020-03-22T16:48:45.5913079Z ##[section]Finishing: Run build
2020-03-22T16:48:45.5969124Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/70277/merge to s
2020-03-22T16:48:45.5974941Z Task         : Get sources
2020-03-22T16:48:45.5975334Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-03-22T16:48:45.5975717Z Version      : 1.0.0
2020-03-22T16:48:45.5976154Z Author       : Microsoft
2020-03-22T16:48:45.5976154Z Author       : Microsoft
2020-03-22T16:48:45.5976561Z Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
2020-03-22T16:48:45.5977047Z ==============================================================================
2020-03-22T16:48:45.9897996Z Cleaning any cached credential from repository: rust-lang/rust (GitHub)
2020-03-22T16:48:45.9952734Z ##[section]Finishing: Checkout rust-lang/rust@refs/pull/70277/merge to s
2020-03-22T16:48:46.0096177Z Cleaning up task key
2020-03-22T16:48:46.0098034Z Start cleaning up orphan processes.
2020-03-22T16:48:46.0315747Z Terminate orphan process: pid (3457) (python)
2020-03-22T16:48:46.0478588Z ##[section]Finishing: Finalize Job

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 @rust-lang/infra. (Feature Requests)

nikomatsakis
nikomatsakis approved these changes Mar 23, 2020
View reviewed changes
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with nits applied

src/librustc_mir/borrow_check/region_infer/mod.rs Outdated Show resolved Hide resolved
src/librustc_mir/borrow_check/region_infer/mod.rs Outdated Show resolved Hide resolved
src/librustc_mir/borrow_check/region_infer/mod.rs Outdated Show resolved Hide resolved
@matthewjasper
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Mar 23, 2020

📌 Commit c3b9881 has been approved by nikomatsakis

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 23, 2020
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge of rust-lang#70277 - matthewjasper:remove-closurebound, …
4c53bfe 
…r=nikomatsakis

Remove `ReClosureBound`

We now substitute external names for regions in the query response.

r? @nikomatsakis
@Centril Centril mentioned this pull request Mar 23, 2020
Closed
Centril added a commit to Centril/rust that referenced this pull request Mar 23, 2020
@Centril
Rollup merge of rust-lang#70277 - matthewjasper:remove-closurebound, …
9327c9d 
…r=nikomatsakis

Remove `ReClosureBound`

We now substitute external names for regions in the query response.

r? @nikomatsakis
This was referenced Mar 23, 2020
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 24, 2020
@bors
Auto merge of rust-lang#70343 - Centril:rollup-94egfvs, r=Centril
342c5f3 
Rollup of 11 pull requests

Successful merges:

 - rust-lang#67761 (Move the dep_graph construction to a dedicated crate.)
 - rust-lang#69740 (Replace some desc logic in librustc_lint with article_and_desc)
 - rust-lang#69981 (Evaluate repeat expression lengths as late as possible)
 - rust-lang#70087 (Remove const eval loop detector)
 - rust-lang#70242 (Improve E0308 error message wording)
 - rust-lang#70264 (Fix invalid suggestion on `&mut` iterators yielding `&` references)
 - rust-lang#70267 (get rid of ConstPropUnsupported; use ZST marker structs instead)
 - rust-lang#70277 (Remove `ReClosureBound`)
 - rust-lang#70283 (Add regression test for rust-lang#70155.)
 - rust-lang#70294 (Account for bad placeholder types in where clauses)
 - rust-lang#70309 (Clean up E0452 explanation)

Failed merges:

r? @ghost
@bors bors merged commit 6c58e01 into rust-lang:master Mar 24, 2020
@matthewjasper matthewjasper deleted the remove-closurebound branch June 23, 2020 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@matthewjasper @rust-highfive @bors @nikomatsakis