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

Remove the unstable and deprecated mpsc_select #60921

Merged
merged 1 commit into from May 20, 2019

Conversation

Projects
None yet
4 participants
@cuviper
Copy link
Member

commented May 17, 2019

This removes macro select! and std::sync::mpsc::{Handle, Select},
which were all unstable and have been deprecated since 1.32.

Closes #27800
r? @SimonSapin

@cuviper

This comment has been minimized.

Copy link
Member Author

commented May 17, 2019

Note: Beyond the API changes, I only removed obviously unused/unreachable code. I suspect more cleanup is possible, like the remaining abort_selection() calls.

cc @stjepang @stepancheg

@rust-highfive

This comment was marked as resolved.

Copy link
Collaborator

commented May 17, 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:00387478:start=1558119532229663837,finish=1558119533022471235,duration=792807398
$ 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
$ export AWS_ACCESS_KEY_ID=AKIA46X5W6CZEJZ6XT55
---

[00:04:29] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:04:29] tidy error: /checkout/src/libstd/sync/mpsc/mod.rs:265: TODO is deprecated; use FIXME
[00:04:34] some tidy checks failed
[00:04:34] 
[00:04:34] 
[00:04:34] 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:34] 
[00:04:34] 
[00:04:34] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:04:34] Build completed unsuccessfully in 0:01:14
[00:04:34] Build completed unsuccessfully in 0:01:14
[00:04:34] Makefile:67: recipe for target 'tidy' failed
[00:04:34] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:07f69e9f
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Fri May 17 19:03:38 UTC 2019
---
travis_time:end:0a6e594c:start=1558119819431420414,finish=1558119819435932593,duration=4512179
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0fe33db0
$ 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:1ab01817
travis_time:start:1ab01817
$ 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:14afbee3
$ 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)

Remove the unstable and deprecated mpsc_select
This removes macro `select!` and `std::sync::mpsc::{Handle, Select}`,
which were all unstable and have been deprecated since 1.32.

@cuviper cuviper force-pushed the cuviper:remove-mpsc_select branch from 99e77a8 to f950193 May 17, 2019

@SimonSapin

This comment has been minimized.

Copy link
Contributor

commented May 19, 2019

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented May 19, 2019

📌 Commit f950193 has been approved by SimonSapin

@bors

This comment has been minimized.

Copy link
Contributor

commented May 20, 2019

⌛️ Testing commit f950193 with merge 589beb9...

bors added a commit that referenced this pull request May 20, 2019

Auto merge of #60921 - cuviper:remove-mpsc_select, r=SimonSapin
Remove the unstable and deprecated mpsc_select

This removes macro `select!` and `std::sync::mpsc::{Handle, Select}`,
which were all unstable and have been deprecated since 1.32.

Closes #27800
r? @SimonSapin
@bors

This comment has been minimized.

Copy link
Contributor

commented May 20, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: SimonSapin
Pushing 589beb9 to master...

@bors bors added the merged-by-bors label May 20, 2019

@bors bors merged commit f950193 into rust-lang:master May 20, 2019

2 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details

@cuviper cuviper deleted the cuviper:remove-mpsc_select branch May 20, 2019

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