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

Stabilize self_in_typedefs feature #56366

Merged
merged 3 commits into from
Dec 3, 2018

Conversation

alexreg
Copy link
Contributor

@alexreg alexreg commented Nov 30, 2018

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 2018
@Centril
Copy link
Contributor

Centril commented Nov 30, 2018

This one will have to wait a bit until we're a bit into the FCP (not started yet) of that PR.

Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

Pending FCP, the changes look good.

@rust-highfive

This comment has been minimized.

@Centril Centril added the relnotes Marks issues that should be documented in the release notes of the next release. label Nov 30, 2018
@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@alexreg alexreg force-pushed the stabilise-self_in_typedefs branch from 7fcd047 to e0fad58 Compare November 30, 2018 17:18
@rust-highfive

This comment has been minimized.

@alexreg alexreg force-pushed the stabilise-self_in_typedefs branch from e0fad58 to 8ab15c0 Compare November 30, 2018 21:57
@bors

This comment has been minimized.

@alexreg alexreg force-pushed the stabilise-self_in_typedefs branch from 8ab15c0 to d609fdf Compare November 30, 2018 22:12
@Centril
Copy link
Contributor

Centril commented Dec 1, 2018

@bors r+

FCP hasn't completed yet but since we close to the master=>beta deadline I'd like to avoid backports so let's land this now. The RFC was rather uncontroversial and since the PR is small we can back out in beta if FCP doesn't complete for some reason.

@bors
Copy link
Contributor

bors commented Dec 1, 2018

📌 Commit d609fdf has been approved by Centril

@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 Dec 1, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Dec 1, 2018
@Centril
Copy link
Contributor

Centril commented Dec 1, 2018

(Note; the tracking issue should be kept open while FCP is still in progress!)

bors added a commit that referenced this pull request Dec 1, 2018
Rollup of 9 pull requests

Successful merges:

 - #55010 (Add template parameter debuginfo to generic types)
 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56402 (Improve the unstable book example for #56408 [marker] trait)
 - #56406 (Update RLS and Rustfmt)
 - #56366 (Stabilize self_in_typedefs feature)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor

Centril commented Dec 1, 2018

@bors rollup

Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2018
… r=Centril

Stabilize self_in_typedefs feature

[**Tracking Issue**](rust-lang#49303)

r? @Centril
Centril added a commit to Centril/rust that referenced this pull request Dec 2, 2018
… r=Centril

Stabilize self_in_typedefs feature

[**Tracking Issue**](rust-lang#49303)

r? @Centril
bors added a commit that referenced this pull request Dec 2, 2018
Rollup of 14 pull requests

Successful merges:

 - #56110 (Consider references and unions potentially inhabited during privacy-respecting inhabitedness checks)
 - #56305 (update miri)
 - #56366 (Stabilize self_in_typedefs feature)
 - #56372 (Refer to the second borrow as the "second borrow" in E0501.rs)
 - #56394 (Deal with EINTR in net timeout tests)
 - #56395 (Stabilize dbg!(...))
 - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block)
 - #56402 (Improve the unstable book example for #[marker] trait)
 - #56412 (Update tracking issue for `extern_crate_self`)
 - #56416 (Remove unneeded body class selector)
 - #56418 (Fix failing tidy (line endings on Windows))
 - #56419 (Remove some uses of try!)
 - #56424 (Mention raw-ident syntax)
 - #56432 (Update issue number of `shrink_to` methods to point the tracking issue)

Failed merges:

r? @ghost
@pietroalbini
Copy link
Member

@bors rollup-

@alexreg
Copy link
Contributor Author

alexreg commented Dec 3, 2018

@pietroalbini Why did this get removed from roll-up, my I ask?

@bors
Copy link
Contributor

bors commented Dec 3, 2018

⌛ Testing commit d609fdf with merge 7199fef2a6f467056d909e2aa78eb81734042b02...

@bors
Copy link
Contributor

bors commented Dec 3, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-debug 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.
[00:12:23] curl: (6) Could not resolve host: static.rust-lang.org
[00:12:23] 
[00:12:23] spurious failure, trying again
[00:13:52] curl: (6) Could not resolve host: static.rust-lang.org
[00:13:52] failed to run: curl -s -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmpx1SQbS.sha256 https://static.rust-lang.org/dist/2018-10-30/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz.sha256
[00:13:52] Makefile:81: recipe for target 'prepare' failed
[00:13:52] make: *** [prepare] Error 1
[00:13:53] Command failed. Attempt 2/5:
[00:15:22] curl: (6) Could not resolve host: static.rust-lang.org
---
[00:19:49] curl: (6) Could not resolve host: static.rust-lang.org
[00:19:49] 
[00:19:49] spurious failure, trying again
[00:21:18] curl: (6) Could not resolve host: static.rust-lang.org
[00:21:18] failed to run: curl -s -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmp4wnb8c.sha256 https://static.rust-lang.org/dist/2018-10-30/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz.sha256
[00:21:18] make: *** [prepare] Error 1
[00:21:18] Makefile:81: recipe for target 'prepare' failed
[00:21:20] Command failed. Attempt 3/5:
[00:22:50] curl: (6) Could not resolve host: static.rust-lang.org
---
[00:27:17] curl: (6) Could not resolve host: static.rust-lang.org
[00:27:17] 
[00:27:17] spurious failure, trying again
[00:28:46] curl: (6) Could not resolve host: static.rust-lang.org
[00:28:46] failed to run: curl -s -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmp0euVYZ.sha256 https://static.rust-lang.org/dist/2018-10-30/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz.sha256
[00:28:46] make: *** [prepare] Error 1
[00:28:46] Makefile:81: recipe for target 'prepare' failed
[00:28:49] Command failed. Attempt 4/5:
[00:30:18] curl: (6) Could not resolve host: static.rust-lang.org
---
[00:34:46] curl: (6) Could not resolve host: static.rust-lang.org
[00:34:46] 
[00:34:46] spurious failure, trying again
[00:36:15] curl: (6) Could not resolve host: static.rust-lang.org
[00:36:15] failed to run: curl -s -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmpGuqCEl.sha256 https://static.rust-lang.org/dist/2018-10-30/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz.sha256
[00:36:15] make: *** [prepare] Error 1
[00:36:15] Makefile:81: recipe for target 'prepare' failed
[00:36:19] Command failed. Attempt 5/5:
[00:37:48] curl: (6) Could not resolve host: static.rust-lang.org
---
[00:42:15] curl: (6) Could not resolve host: static.rust-lang.org
[00:42:15] 
[00:42:15] spurious failure, trying again
[00:43:45] curl: (6) Could not resolve host: static.rust-lang.org
[00:43:45] failed to run: curl -s -y 30 -Y 10 --connect-timeout 30 --retry 3 -Sf -o /tmp/tmpoVryFu.sha256 https://static.rust-lang.org/dist/2018-10-30/rust-std-beta-x86_64-unknown-linux-gnu.tar.gz.sha256
[00:43:45] Makefile:81: recipe for target 'prepare' failed
[00:43:45] make: *** [prepare] Error 1
[00:43:45] The command has failed after 5 attempts.
travis_time:end:08db2dd8:start=1543818272790084160,finish=1543820898121292130,duration=2625331207970
---
travis_time:end:0ccdfb80:start=1543820899189282557,finish=1543820899197623496,duration=8340939
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1ee31c9a
$ 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:0aef848b
travis_time:start:0aef848b
$ 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:02bf1976
$ 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)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 3, 2018
@pietroalbini
Copy link
Member

@bors retry travis-ci/travis-ci#9696

@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 Dec 3, 2018
kennytm added a commit to kennytm/rust that referenced this pull request Dec 3, 2018
… r=Centril

Stabilize self_in_typedefs feature

[**Tracking Issue**](rust-lang#49303)

r? @Centril
bors added a commit that referenced this pull request Dec 3, 2018
Rollup of 13 pull requests

Successful merges:

 - #56141 ([std] Osstr len clarity)
 - #56366 (Stabilize self_in_typedefs feature)
 - #56395 (Stabilize dbg!(...))
 - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block)
 - #56402 (Improve the unstable book example for #[marker] trait)
 - #56412 (Update tracking issue for `extern_crate_self`)
 - #56416 (Remove unneeded body class selector)
 - #56418 (Fix failing tidy (line endings on Windows))
 - #56419 (Remove some uses of try!)
 - #56432 (Update issue number of `shrink_to` methods to point the tracking issue)
 - #56433 (Add description about `crate` for parse_visibility's comment)
 - #56435 (make the C part of compiler-builtins opt-out)
 - #56438 (Remove not used `DotEq` token)

Failed merges:

r? @ghost
@bors bors merged commit d609fdf into rust-lang:master Dec 3, 2018
@Centril Centril added this to the 1.32 milestone Apr 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Marks issues that should be documented in the release notes of the next release. 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.

5 participants