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.

Sign up for GitHub

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

Jump to bottom

refactor match guard #53815

Merged
merged 1 commit into from
Sep 1, 2018
Merged

refactor match guard #53815

merged 1 commit into from
Sep 1, 2018

Conversation

F001
Copy link
Contributor

@F001 F001 commented Aug 30, 2018 •
edited
Loading

This is the first step to implement RFC 2294: if-let-guard. Tracking issue: #51114

The second step should be introducing another variant IfLet in the Guard enum. I separated them into 2 PRs for the convenience of reviewers.

r? @petrochenkov

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

My only concern is that there's pretty long road between adding if-let guards into AST/HIR and making them actually work, so this might stay as dead code for some time.
@bors r+

@bors
Copy link
Contributor

bors commented Aug 31, 2018

📌 Commit 7a083ca has been approved by petrochenkov

@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 Aug 31, 2018
@F001
Copy link
Contributor Author

F001 commented Sep 1, 2018

Thanks! This feature is definitely a challenge to me. If no one else is doing this, I'd like to have a try.

@bors
Copy link
Contributor

bors commented Sep 1, 2018

⌛ Testing commit 7a083ca with merge bcd0c64d4f1d1a4b58f8cf763d3a2b8d14192f06...

@bors
Copy link
Contributor

bors commented Sep 1, 2018

💔 Test failed - status-travis

@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 Sep 1, 2018
@rust-highfive
Copy link
Collaborator

The job dist-various-1 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. 
[01:02:19] test [run-make] run-make/thumb-none-cortex-m ... FAILED
[01:02:19] 
[01:02:19] failures:
[01:02:19] 
[01:02:19] ---- [run-make] run-make/thumb-none-cortex-m stdout ----
[01:02:19] error: make failed
[01:02:19] status: exit code: 2
[01:02:19] command: "make"
[01:02:19] stdout:
---
[01:02:19] CC_armebv7r_none_eabi=arm-none-eabi-gcc
[01:02:19] S=/checkout
[01:02:19] _=/bin/sh
[01:02:19] TOOLSTATE_REPO_ACCESS_TOKEN=[secure]
[01:02:19] TRAVIS=true
[01:02:19] RUST_RELEASE_CHANNEL=nightly
[01:02:19] PATH=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
[01:02:19] RUN_MAKE_TARGETS=thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf
[01:02:19] RUSTC=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc
[01:02:19] RUST_BUILD_STAGE=stage2-thumbv6m-none-eabi
[01:02:19] BOOTSTRAP_PYTHON=/usr/bin/python2.7
[01:02:19] SCRIPT=python2.7 ../x.py test --target thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf src/test/run-make &&       python2.7 ../x.py dist --target asmjs-unknown-emscripten,wasm32-unknown-emscripten,x86_64-rumprun-netbsd,mips-unknown-linux-musl,mipsel-unknown-linux-musl,arm-unknown-linux-musleabi,arm-unknown-linux-musleabihf,armv5te-unknown-linux-gnueabi,armv5te-unknown-linux-musleabi,armv7-unknown-linux-musleabihf,aarch64-unknown-linux-musl,sparc64-unknown-linux-gnu,x86_64-unknown-redox,thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf,riscv32imac-unknown-none-elf,armebv7r-none-eabi,armebv7r-none-eabihf,armv7r-none-eabi,armv7r-none-eabihf
[01:02:19] AR=ar
[01:02:19] TRAVIS_BRANCH=auto
[01:02:19] RUSTC_BOOTSTRAP=1
[01:02:19] HOST_RPATH_DIR=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib
[01:02:19] SCCACHE_BUCKET=rust-lang-ci-sccache2
[01:02:19] PWD=/checkout/obj
[01:02:19] CI_JOB_NAME=dist-various-1
[01:02:19] TARGET_RPATH_DIR=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/thumbv6m-none-eabi/lib
[01:02:19] LD_LIB_PATH_ENVVAR=LD_LIBRARY_PATH
[01:02:19] PYTHON=/usr/bin/python2.7
[01:02:19] HOME=/home/user
[01:02:19] LD_LIBRARY_PATH=/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib
[01:02:19] HOSTNAME=9c6f40c5f366
[01:02:19] CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc
[01:02:19] SHLVL=2
[01:02:19] CC= 
[01:02:19] BUILD_DIR=/checkout/obj/build
[01:02:19] BUILD_DIR=/checkout/obj/build
[01:02:19] RUST_TEST_TMPDIR=/checkout/obj/build/tmp
[01:02:19] LLVM_CXXFLAGS=
[01:02:19] STAGING_DIR=/tmp
[01:02:19] TMPDIR=/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m
[01:02:19] TARGETS=asmjs-unknown-emscripten,wasm32-unknown-emscripten,x86_64-rumprun-netbsd,mips-unknown-linux-musl,mipsel-unknown-linux-musl,arm-unknown-linux-musleabi,arm-unknown-linux-musleabihf,armv5te-unknown-linux-gnueabi,armv5te-unknown-linux-musleabi,armv7-unknown-linux-musleabihf,aarch64-unknown-linux-musl,sparc64-unknown-linux-gnu,x86_64-unknown-redox,thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf,riscv32imac-unknown-none-elf,armebv7r-none-eabi,armebv7r-none-eabihf,armv7r-none-eabi,armv7r-none-eabihf
[01:02:19] RUST_CONFIGURE_ARGS=--musl-root-armv5te=/musl-armv5te       --musl-root-arm=/musl-arm       --musl-root-armhf=/musl-armhf       --musl-root-armv7=/musl-armv7       --musl-root-aarch64=/musl-aarch64       --musl-root-mips=/musl-mips       --musl-root-mipsel=/musl-mipsel       --enable-emscripten       --disable-docs --set build.print-step-timings --enable-verbose-tests --enable-sccache --disable-manage-submodules --enable-locked-deps --enable-cargo-openssl-static --disable-dist-src --release-channel=nightly --enable-llvm-static-stdcpp
[01:02:19] MAKEFLAGS=
[01:02:19] MFLAGS=
[01:02:19] BOOTSTRAP_PARENT_ID=1045
[01:02:19] BOOTSTRAP_PARENT_ID=1045
[01:02:19] __COMPAT_LAYER=RunAsInvoker
[01:02:19] CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc
[01:02:19] BUILD=x86_64-unknown-linux-gnu
[01:02:19] CXX= 
[01:02:19] AWS_ACCESS_KEY_ID=AKIAJAMV3QAMMA6AXHFQ
[01:02:19] CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc
[01:02:19] CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc
[01:02:19] CARGO_HOME=/cargo
[01:02:19] RUSTC_LINKER=arm-none-eabi-gcc
[01:02:19] SCCACHE_REGION=us-west-1
[01:02:19] CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc
[01:02:19] LLVM_COMPONENTS=
[01:02:19] TERM=xterm
[01:02:19] MAKELEVEL=1
[01:02:19] mkdir -p /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m
[01:02:19] cd /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m && rm -rf cortex-m
[01:02:19] cd /checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/thumb-none-cortex-m/thumb-none-cortex-m && bash -x /checkout/src/test/run-make/thumb-none-cortex-m/../git_clone_sha1.sh cortex-m https://github.com/rust-embedded/cortex-m a448e9156e2cb1e556e5441fd65426952ef4b927 
[01:02:19] Makefile:29: recipe for target 'all' failed
[01:02:19] 
[01:02:19] ------------------------------------------
[01:02:19] stderr:
[01:02:19] stderr:
[01:02:19] ------------------------------------------
[01:02:19] + PROJECT_NAME=cortex-m
[01:02:19] + URL=https://github.com/rust-embedded/cortex-m
[01:02:19] + SHA1=a448e9156e2cb1e556e5441fd65426952ef4b927
[01:02:19] + git clone https://github.com/rust-embedded/cortex-m cortex-m
[01:02:19] Cloning into 'cortex-m'...
[01:02:19] fatal: unable to access 'https://github.com/rust-embedded/cortex-m/': Could not resolve host: github.com
[01:02:19] + err_exit
[01:02:19] + echo ERROR:
[01:02:19] + exit 1
[01:02:19] make: *** [all] Error 1
[01:02:19] ------------------------------------------
[01:02:19] 
[01:02:19] 
[01:02:19] thread '[run-make] run-make/thumb-none-cortex-m' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:3196:9
[01:02:19] 
[01:02:19] 
[01:02:19] failures:
[01:02:19]     [run-make] run-make/thumb-none-cortex-m
[01:02:19]     [run-make] run-make/thumb-none-cortex-m
[01:02:19] 
[01:02:19] test result: FAILED. 6 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:02:19] 
[01:02:19] 
[01:02:19] 
[01:02:19] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/thumbv6m-none-eabi/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/run-make" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make" "--stage-id" "stage2-thumbv6m-none-eabi" "--mode" "run-make" "--target" "thumbv6m-none-eabi" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "arm-none-eabi-gcc" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/thumbv6m-none-eabi/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--llvm-version" "8.0.0svn\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:02:19] 
[01:02:19] 
[01:02:19] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target thumbv6m-none-eabi,thumbv7m-none-eabi,thumbv7em-none-eabi,thumbv7em-none-eabihf src/test/run-make
[01:02:19] Build completed unsuccessfully in 0:56:44
---
travis_time:end:2dafe924:start=1535784484819750489,finish=1535784484826405820,duration=6655331
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:1d1519e8
$ 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 -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:0c9ffa86
travis_time:start:0c9ffa86
$ 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:061b1750
$ 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)

@petrochenkov
Copy link
Contributor

fatal: unable to access 'https://github.com/rust-embedded/cortex-m/': Could not resolve host: github.com

@bors retry

@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 Sep 1, 2018
@bors
Copy link
Contributor

bors commented Sep 1, 2018

⌛ Testing commit 7a083ca with merge 28bcffe...

bors added a commit that referenced this pull request Sep 1, 2018
@bors
Auto merge of #53815 - F001:if-let-guard, r=petrochenkov
28bcffe 
refactor match guard

This is the first step to implement RFC 2294: if-let-guard. Tracking issue: #51114

The second step should be introducing another variant `IfLet` in the Guard enum. I separated them into 2 PRs for the convenience of reviewers.

r? @petrochenkov
@bors
Copy link
Contributor

bors commented Sep 1, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 28bcffe to master...

@bors bors merged commit 7a083ca into rust-lang:master Sep 1, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #53815!

Tested on commit 28bcffe.
Direct link to PR: #53815

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Sep 1, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#53815!
c08f8e6 
Tested on commit rust-lang/rust@28bcffe.
Direct link to PR: <rust-lang/rust#53815>

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
@ghost ghost mentioned this pull request Sep 2, 2018
Closed
@topecongiro topecongiro mentioned this pull request Sep 3, 2018
Merged
@petrochenkov petrochenkov mentioned this pull request Feb 8, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@F001 @petrochenkov @bors @rust-highfive