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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stabilize refcell_replace_swap feature #59581

Merged
merged 2 commits into from Mar 31, 2019

Conversation

Projects
None yet
5 participants
@jmcomets
Copy link
Contributor

jmcomets commented Mar 31, 2019

Please be kind, this is my first time contributing. 馃槃

I noticed #43570 only needs stabilizing (and I need it for a side project I'm working on), so I followed the guide to move things forward.

I'm happy to amend things if needed, let me know!

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Mar 31, 2019

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @pnkfelix (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

Show resolved Hide resolved src/libcore/cell.rs
Show resolved Hide resolved src/libsyntax/feature_gate.rs Outdated
@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Mar 31, 2019

Hi! Thanks for you contribution. :)

r? @Centril

r=me with changes requested above and green travis :)

@rust-highfive rust-highfive assigned Centril and unassigned pnkfelix Mar 31, 2019

@Centril Centril added this to the 1.35 milestone Mar 31, 2019

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

rust-highfive commented Mar 31, 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:0f63693c:start=1554035412532917029,finish=1554035414647948673,duration=2115031644
$ 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
$ export GCP_CACHE_BUCKET=rust-lang-ci-cache
Setting environment variables from .travis.yml
---
travis_time:start:tidy
tidy check
[00:04:07] * 569 error codes
[00:04:07] * highest error code: E0725
[00:04:07] tidy error: /checkout/src/libcore/cell.rs:721: mismatches the `issue` in corresponding lang feature
[00:04:08] some tidy checks failed
[00:04:08] 
[00:04:08] 
[00:04:08] 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" "--no-vendor" "--quiet"
[00:04:08] 
[00:04:08] 
[00:04:08] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:08] Build completed unsuccessfully in 0:00:48
[00:04:08] Build completed unsuccessfully in 0:00:48
[00:04:08] Makefile:67: recipe for target 'tidy' failed
[00:04:08] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:01b2eab8
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Sun Mar 31 12:34:33 UTC 2019
---
travis_time:end:1ccbd674:start=1554035674146063371,finish=1554035674151204809,duration=5141438
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1a68b948
$ 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:173c62e4
travis_time:start:173c62e4
$ 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:0e7f4016
$ 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)

@jmcomets

This comment has been minimized.

Copy link
Contributor Author

jmcomets commented Mar 31, 2019

There's an issue with the tidy check in the Travis build, @Centril do you mind giving me some help figuring it out?

Here's what I pinpointed:

tidy error: /checkout/src/libcore/cell.rs:721: mismatches the `issue` in corresponding lang feature

I understand that the feature entry isn't valid, but I'm not sure what to put instead. 鈽癸笍

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Mar 31, 2019

@jmcomets Good eye! It should just go away with your last commit. :)

@Centril

This comment has been minimized.

Copy link
Contributor

Centril commented Mar 31, 2019

@bors r+ rollup

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Mar 31, 2019

馃搶 Commit c789a53 has been approved by Centril

Centril added a commit to Centril/rust that referenced this pull request Mar 31, 2019

Rollup merge of rust-lang#59581 - jmcomets:stabilize-refcell_replace_鈥
鈥wap, r=Centril

Stabilize refcell_replace_swap feature

Please be kind, this is my first time contributing. 馃槃

I noticed rust-lang#43570 only needs stabilizing (and I need it for a side project I'm working on), so I followed the [guide](https://rust-lang.github.io/rustc-guide/stabilization_guide.html#stabilization-pr) to move things forward.

I'm happy to amend things if needed, let me know!

bors added a commit that referenced this pull request Mar 31, 2019

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

Successful merges:

 - #58805 (Lint for redundant imports)
 - #59506 (Use platform dependent mcount function)
 - #59519 (rustc_target: factor out common fields of non-Single Variants.)
 - #59580 (Allow closure to unsafe fn coercion)
 - #59581 (Stabilize refcell_replace_swap feature)
 - #59583 (match match match match match)
 - #59587 (Remove #[doc(hidden)] from Error::type_id)

Failed merges:

r? @ghost

@bors bors merged commit c789a53 into rust-lang:master Mar 31, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can鈥檛 perform that action at this time.