remove leftover mentions of `skol` and `int` from the compiler #73055

lcnr · 2020-06-06T10:09:04Z

This PR mostly changes skol -> placeholder and all cases where int is used as a type to i32.

rust-highfive · 2020-06-06T10:09:07Z

r? @matthewjasper

(rust_highfive has picked a reviewer for you, use r? to override)

matthewjasper

r=me I'm not sure if you would want to remove the dead code now or in a follow up PR.

src/librustc_infer/infer/region_constraints/mod.rs

src/librustc_infer/infer/higher_ranked/mod.rs

rust-highfive · 2020-06-06T16:34:20Z

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.

##[section]Starting: Linux mingw-check
##[section]Starting: Initialize job
Agent name: 'Azure Pipelines 67'
Agent machine name: 'fv-az619'
Current agent version: '2.169.1'
##[group]Operating System
16.04.6
LTS
LTS
##[endgroup]
##[group]Virtual Environment
Environment: ubuntu-16.04
Version: 20200517.1
Included Software: /~https://github.com/actions/virtual-environments/blob/ubuntu16/20200517.1/images/linux/Ubuntu1604-README.md
##[endgroup]
Agent running as: 'vsts'
Prepare build directory.
Set build variables.
Download all required tasks.
Download all required tasks.
Downloading task: Bash (3.163.3)
Checking job knob settings.
   Knob: AgentToolsDirectory = /opt/hostedtoolcache Source: ${AGENT_TOOLSDIRECTORY} 
   Knob: AgentPerflog = /home/vsts/perflog Source: ${VSTS_AGENT_PERFLOG} 
Start tracking orphan processes.
##[section]Finishing: Initialize job
##[section]Starting: Configure Job Name
==============================================================================
---
========================== Starting Command Output ===========================
[command]/bin/bash --noprofile --norc /home/vsts/work/_temp/252389cf-ed64-4801-8bff-611a89c71467.sh

##[section]Finishing: Disable git automatic line ending conversion
##[section]Starting: Checkout rust-lang/rust@refs/pull/73055/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
---
##[command]git remote add origin /~https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http./~https://github.com/rust-lang/rust.extraheader
##[command]git config --get-all http.proxy
##[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/73055/merge:refs/remotes/pull/73055/merge
---
 ---> 3adb0605cc65
Step 6/7 : ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
 ---> Using cache
 ---> 28dbc326cb7f
Step 7/7 : ENV SCRIPT python3 ../x.py test src/tools/expand-yaml-anchors &&            python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu &&            python3 ../x.py build --stage 0 src/tools/build-manifest &&            python3 ../x.py test --stage 0 src/tools/compiletest &&            python3 ../x.py test src/tools/tidy &&            python3 ../x.py doc --stage 0 src/libstd &&            /scripts/validate-toolstate.sh
 ---> 537a01811900
Successfully built 537a01811900
Successfully tagged rust-ci:latest
Built container sha256:537a018119009dc218456238dec90b5530050db1e2a1e166550c218003f6159d
---
    Checking chalk-rust-ir v0.10.0
    Checking rustc_ast_pretty v0.0.0 (/checkout/src/librustc_ast_pretty)
    Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
    Checking rustc_session v0.0.0 (/checkout/src/librustc_session)
    Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
    Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
    Checking rustc_hir_pretty v0.0.0 (/checkout/src/librustc_hir_pretty)
    Checking rustc_ast_lowering v0.0.0 (/checkout/src/librustc_ast_lowering)
    Checking rustc_ast_passes v0.0.0 (/checkout/src/librustc_ast_passes)
---
configure: llvm.ccache          := sccache
configure: rust.debug-assertions := True
configure: build.locked-deps    := True
configure: build.submodules     := False
configure: build.configure-args := ['--enable-sccache', '--disable-manage-submodu ...
configure: writing `config.toml` in current directory
configure: 
configure: run `python /checkout/x.py --help`
configure: 
---
Hugepagesize:       2048 kB
DirectMap4k:      110528 kB
DirectMap2M:     4083712 kB
DirectMap1G:     5242880 kB
+ python3 ../x.py test src/tools/expand-yaml-anchors
Ensuring the YAML anchors in the GitHub Actions config were expanded
Ensuring the YAML anchors in the GitHub Actions config were expanded
Building stage0 tool expand-yaml-anchors (x86_64-unknown-linux-gnu)
   Compiling unicode-xid v0.2.0
   Compiling syn v1.0.11
   Compiling linked-hash-map v0.5.2
   Compiling lazy_static v1.4.0
   Compiling lazy_static v1.4.0
   Compiling yaml-rust v0.4.3
   Compiling quote v1.0.2
   Compiling thiserror-impl v1.0.5
   Compiling thiserror v1.0.5
   Compiling yaml-merge-keys v0.4.0
   Compiling expand-yaml-anchors v0.1.0 (/checkout/src/tools/expand-yaml-anchors)
Build completed successfully in 0:00:32
+ python3 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
    Finished dev [unoptimized] target(s) in 0.17s
Checking rustdoc artifacts (x86_64-unknown-linux-gnu -> i686-pc-windows-gnu)
---
    Checking rustc_span v0.0.0 (/checkout/src/librustc_span)
    Checking rustc_errors v0.0.0 (/checkout/src/librustc_errors)
    Checking rustc_feature v0.0.0 (/checkout/src/librustc_feature)
    Checking rustc_parse_format v0.0.0 (/checkout/src/librustc_parse_format)
    Checking chalk-rust-ir v0.10.0
    Checking rustc_query_system v0.0.0 (/checkout/src/librustc_query_system)
    Checking rustc_session v0.0.0 (/checkout/src/librustc_session)
    Checking rustc_hir v0.0.0 (/checkout/src/librustc_hir)
    Checking chalk-solve v0.10.0
    Checking rustc_parse v0.0.0 (/checkout/src/librustc_parse)
---
   Compiling cargo_metadata v0.9.1
   Compiling tidy v0.1.0 (/checkout/src/tools/tidy)
    Finished release [optimized] target(s) in 25.02s
tidy check
tidy error: /checkout/src/librustc_infer/infer/higher_ranked/mod.rs:68: TODO is deprecated; use FIXME
some tidy checks failed
Found 497 error codes
Found 0 error codes with no tests
Done!
Done!


command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo"


failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
Build completed unsuccessfully in 0:00:35
Build completed unsuccessfully in 0:00:35
== clock drift check ==
  local time: Sat Jun  6 15:08:08 UTC 2020
  network time: Sat, 06 Jun 2020 15:08:08 GMT
== end clock drift check ==

##[error]Bash exited with code '1'.
##[section]Finishing: Run build
##[section]Starting: Checkout rust-lang/rust@refs/pull/73055/merge to s
Task         : Get sources
Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
Version      : 1.0.0
Author       : Microsoft
Author       : Microsoft
Help         : [More Information](https://go.microsoft.com/fwlink/?LinkId=798199)
==============================================================================
Cleaning any cached credential from repository: rust-lang/rust (GitHub)
##[section]Finishing: Checkout rust-lang/rust@refs/pull/73055/merge to s
Cleaning up task key
Start cleaning up orphan processes.
Terminate orphan process: pid (3388) (python)
##[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)

bors · 2020-06-09T13:29:56Z

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

lcnr · 2020-06-20T09:04:39Z

src/librustc_infer/infer/higher_ranked/mod.rs

-    /// Moreover, before committing the snapshot, you must eventually call
-    /// either `plug_leaks` or `pop_placeholders` to remove the placeholder
-    /// regions. If you rollback the snapshot (or are using a probe), then
-    /// the pop occurs as part of the rollback, so an explicit call is not


@matthewjasper I removed the outdated note here, even if the new one doesn't completely explain what needs to be done, I would still like to land this as is now.

matthewjasper · 2020-06-20T13:45:53Z

@bors r+

bors · 2020-06-20T13:45:55Z

📌 Commit 180334c has been approved by matthewjasper

@ghost

Rollup of 9 pull requests Successful merges: - rust-lang#72600 (Properly encode AnonConst into crate metadata) - rust-lang#73055 (remove leftover mentions of `skol` and `int` from the compiler) - rust-lang#73058 (Support sanitizers on aarch64-unknown-linux-gnu) - rust-lang#73171 (RISC-V Emulated Testing) - rust-lang#73404 (Update CFGuard syntax) - rust-lang#73444 (ci: disable alt build during try builds) - rust-lang#73471 (Prevent attacker from manipulating FPU tag word used in SGX enclave) - rust-lang#73539 (Deprecate `Vec::remove_item`) - rust-lang#73543 (Clean up E0695 explanation) Failed merges: r? @ghost

remove leftover mentions of `skol` and `int` from the compiler This PR mostly changes `skol` -> `placeholder` and all cases where `int` is used as a type to `i32`.

As rust-lang#72114 and rust-lang#73055 were merged so closely together I think this accidentally happened while rebasing

…-schievink Revert the revert of renaming traits::VTable to ImplSource As rust-lang#72114 and rust-lang#73055 were merged so closely together I think this accidentally happened while rebasing

rust-highfive assigned matthewjasper Jun 6, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 6, 2020

lcnr changed the title ~~remove all leftover mentions of skol and int from the compiler~~ remove leftover mentions of skol and int from the compiler Jun 6, 2020

matthewjasper approved these changes Jun 6, 2020

View reviewed changes

src/librustc_infer/infer/region_constraints/mod.rs Outdated Show resolved Hide resolved

lcnr commented Jun 6, 2020

View reviewed changes

src/librustc_infer/infer/higher_ranked/mod.rs Outdated Show resolved Hide resolved

JohnCSimon 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 16, 2020

lcnr added 3 commits June 20, 2020 10:43

skol -> placeholder

c4840db

int -> i32

a24c897

remove pop_placeholders

180334c

lcnr force-pushed the skol-no-more branch from 0aa7814 to 180334c Compare June 20, 2020 08:58

lcnr commented Jun 20, 2020

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 20, 2020

RalfJung mentioned this pull request Jun 20, 2020

Rollup of 9 pull requests #73550

Merged

Manishearth mentioned this pull request Jun 20, 2020

Rollup of 9 pull requests #73558

Closed

bors merged commit b015b28 into rust-lang:master Jun 20, 2020

lcnr deleted the skol-no-more branch June 21, 2020 07:45

ptrojahn added a commit to ptrojahn/rust that referenced this pull request Jul 9, 2021

Revert the revert of renaming traits::VTable to ImplSource

5cf954f

As rust-lang#72114 and rust-lang#73055 were merged so closely together I think this accidentally happened while rebasing

ptrojahn mentioned this pull request Jul 9, 2021

Revert the revert of renaming traits::VTable to ImplSource #87006

Merged

cuviper added this to the 1.46 milestone May 2, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove leftover mentions of `skol` and `int` from the compiler #73055

remove leftover mentions of `skol` and `int` from the compiler #73055

lcnr commented Jun 6, 2020 •

edited

Loading

rust-highfive commented Jun 6, 2020

matthewjasper left a comment

rust-highfive commented Jun 6, 2020

bors commented Jun 9, 2020

lcnr Jun 20, 2020

matthewjasper commented Jun 20, 2020

bors commented Jun 20, 2020

remove leftover mentions of skol and int from the compiler #73055

remove leftover mentions of skol and int from the compiler #73055

Conversation

lcnr commented Jun 6, 2020 • edited Loading

rust-highfive commented Jun 6, 2020

matthewjasper left a comment

Choose a reason for hiding this comment

rust-highfive commented Jun 6, 2020

bors commented Jun 9, 2020

lcnr Jun 20, 2020

Choose a reason for hiding this comment

matthewjasper commented Jun 20, 2020

bors commented Jun 20, 2020

remove leftover mentions of `skol` and `int` from the compiler #73055

remove leftover mentions of `skol` and `int` from the compiler #73055

lcnr commented Jun 6, 2020 •

edited

Loading