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.

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

[Step 1] Implement "small substs optimization" for substs of length 1 #58321

Merged
merged 2 commits into from
Feb 27, 2019

Conversation

csmoe
Copy link
Member

@csmoe csmoe commented Feb 9, 2019

addresses part of #58310
r?@arielb1

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 9, 2019
@csmoe csmoe force-pushed the substs branch 2 times, most recently from 676060b to ddc37ea Compare February 9, 2019 14:29
@bors
Copy link
Contributor

bors commented Feb 12, 2019

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

@oli-obk
Copy link
Contributor

oli-obk commented Feb 18, 2019

Do you want this merged as a first step in order to reduce the maintainance burden on the full fix?

@csmoe
Copy link
Member Author

csmoe commented Feb 18, 2019

@oli-obk yes.(will rebase for merging soon)

@rust-highfive
Copy link
Collaborator

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:1c256f9a:start=1550583781458961467,finish=1550583784336939552,duration=2877978085
$ 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:06:24]    Compiling rustc_errors v0.0.0 (/checkout/src/librustc_errors)
[00:07:33]    Compiling syntax_ext v0.0.0 (/checkout/src/libsyntax_ext)
[00:13:07]    Compiling rustc_mir v0.0.0 (/checkout/src/librustc_mir)
[00:13:07]    Compiling rustc_typeck v0.0.0 (/checkout/src/librustc_typeck)
[00:13:13] error[E0599]: no method named `subst` found for type `rustc::ty::FnSig<'_>` in the current scope
[00:13:13]    --> src/librustc_typeck/check/method/confirm.rs:398:37
[00:13:13]     |
[00:13:13] 398 |         let method_sig = method_sig.subst(self.tcx, all_substs);
[00:13:13]     |
[00:13:13]     = help: items from traits can only be used if the trait is in scope
[00:13:13]     = note: the following trait is implemented but not in scope, perhaps add a `use` for it:
[00:13:13]             `use rustc::ty::subst::Subst;`
---
[00:17:08] 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:17:08] expected success, got: exit code: 101
[00:17:08] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:17:08] Build completed unsuccessfully in 0:12:51
[00:17:08] make: *** [all] Error 1
[00:17:08] Makefile:18: recipe for target 'all' failed
69084 ./obj/build/x86_64-unknown-linux-gnu/stage0-std
60736 ./obj/build/x86_64-unknown-linux-gnu/stage0/bin
59032 ./.git/modules/src/tools
57404 ./src/llvm-project/llvm/test/MC
---
travis_time:end:0af6f738:start=1550584824802203491,finish=1550584824807255653,duration=5052162
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:030a0137
$ 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:10752de0
travis_time:start:10752de0
$ 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/clan

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)

@csmoe csmoe force-pushed the substs branch 2 times, most recently from 02a1e81 to 043ca28 Compare February 20, 2019 14:27
@bors
Copy link
Contributor

bors commented Feb 22, 2019

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

@Centril
Copy link
Contributor

Centril commented Feb 23, 2019

Ping from triage, @arielb1, aside from the conflict, can you take a look at this?

@csmoe csmoe force-pushed the substs branch 2 times, most recently from 6b8425b to f931e4c Compare February 23, 2019 13:12
@oli-obk
Copy link
Contributor

oli-obk commented Feb 24, 2019

What do you think about #58310 (comment) (renameing SubstsRef to Substs and getting rid of the old Substs type alias)?

@arielb1
Copy link
Contributor

arielb1 commented Feb 24, 2019

@csmoe

Do you think this is ready to review for step 1? In that case, remove the WIP tag and change the commit message to mention this is only step 1.

src/librustc/ty/subst.rs Outdated Show resolved Hide resolved
@oli-obk
Copy link
Contributor

oli-obk commented Feb 26, 2019

Needs a rebase and PR topic adjustments: WIP removed and "Step 1" added

@rust-highfive

This comment has been minimized.

@csmoe csmoe force-pushed the substs branch 2 times, most recently from b04776d to 51b7936 Compare February 26, 2019 13:28
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@csmoe csmoe force-pushed the substs branch 2 times, most recently from 7a6afef to f1a2f9e Compare February 26, 2019 16:37
@csmoe csmoe force-pushed the substs branch 2 times, most recently from 05cb6e4 to 3cec8ad Compare February 26, 2019 16:39
Change-Id: I3fa00e999a2ee4eb72db1fdf53a8633b49176a18
@csmoe csmoe changed the title [WIP] Implement "small substs optimization" for substs of length 1 [Step 1] Implement "small substs optimization" for substs of length 1 Feb 26, 2019
@oli-obk
Copy link
Contributor

oli-obk commented Feb 26, 2019

@bors r+ p=1 (prioritizing due to extreme bitrotty nature)

@bors
Copy link
Contributor

bors commented Feb 26, 2019

📌 Commit cf11729 has been approved by oli-obk

@bors 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 26, 2019
@varkor
Copy link
Member

varkor commented Feb 26, 2019

Closes #58310

As this is no longer the complete solution, I assume this PR should no longer be marked as fixing #58310?

@oli-obk
Copy link
Contributor

oli-obk commented Feb 26, 2019

I edited the main description

@bors
Copy link
Contributor

bors commented Feb 27, 2019

⌛ Testing commit cf11729 with merge f0be457...

bors added a commit that referenced this pull request Feb 27, 2019
[Step 1] Implement "small substs optimization" for substs of length 1

addresses part of #58310
r?@arielb1
@bors
Copy link
Contributor

bors commented Feb 27, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: oli-obk
Pushing f0be457 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 27, 2019
@bors bors merged commit cf11729 into rust-lang:master Feb 27, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #58321!

Tested on commit f0be457.
Direct link to PR: #58321

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Feb 27, 2019
Tested on commit rust-lang/rust@f0be457.
Direct link to PR: <rust-lang/rust#58321>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 rls on windows: test-pass → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-pass → build-fail (cc @nrc @Xanewok, @rust-lang/infra).
phansch added a commit to phansch/rust-clippy that referenced this pull request Feb 27, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Feb 27, 2019
@Xanewok Xanewok mentioned this pull request Feb 28, 2019
bors added a commit that referenced this pull request Mar 4, 2019
Update Clippy

Should fix the fallout caused by #58321 (still testing it locally).

r? @oli-obk
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants