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

Jump to bottom

Stabilize the loop_break_value feature #42016

Merged
merged 1 commit into from May 23, 2017
Merged

Stabilize the loop_break_value feature #42016

merged 1 commit into from May 23, 2017

Conversation

pietroalbini
Copy link
Member

Tracking issue: #37339.

Documentation PRs already sent to the various repositories.

@rust-highfive
Copy link
Collaborator

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.

@arielb1
Copy link
Contributor

arielb1 commented May 16, 2017

I think you forgot to update the tests:

[00:38:10] ---- [compile-fail] compile-fail/feature-gate-loop-break-value.rs stdout ----

[00:38:10] 	

[00:38:10] error: /checkout/src/test/compile-fail/feature-gate-loop-break-value.rs:13: unexpected "error": '13:15: 13:18: mismatched types [E0308]'

[00:38:10] 

[00:38:10] error: /checkout/src/test/compile-fail/feature-gate-loop-break-value.rs:13: expected error not found: `break` with a value is experimental

[00:38:10] 

[00:38:10] error: 1 unexpected errors found, 1 expected errors not found

[00:38:10] status: exit code: 101

[00:38:10] command: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc /checkout/src/test/compile-fail/feature-gate-loop-break-value.rs -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail --target=x86_64-unknown-linux-gnu --error-format json -L /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/feature-gate-loop-break-value.stage2-x86_64-unknown-linux-gnu.compile-fail.libaux -C prefer-dynamic -o /checkout/obj/build/x86_64-unknown-linux-gnu/test/compile-fail/feature-gate-loop-break-value.stage2-x86_64-unknown-linux-gnu -Crpath -O -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers

[00:38:10] unexpected errors (from JSON output): [

[00:38:10]     Error {

[00:38:10]         line_num: 13,

[00:38:10]         kind: Some(

[00:38:10]             Error

[00:38:10]         ),

[00:38:10]         msg: "13:15: 13:18: mismatched types [E0308]"

[00:38:10]     }

[00:38:10] ]

[00:38:10] 

[00:38:10] not found errors (from test file): [

[00:38:10]     Error {

[00:38:10]         line_num: 13,

[00:38:10]         kind: Some(

[00:38:10]             Error

[00:38:10]         ),

[00:38:10]         msg: "`break` with a value is experimental"

[00:38:10]     }

[00:38:10] ]

[00:38:10] 

[00:38:10] thread '[compile-fail] compile-fail/feature-gate-loop-break-value.rs' panicked at 'explicit panic', /checkout/src/tools/compiletest/src/runtest.rs:1129

[00:38:10] note: Run with `RUST_BACKTRACE=1` for a backtrace.

@pietroalbini
Copy link
Member Author

Woops! Removed that test.

@bors
Copy link
Contributor

bors commented May 17, 2017

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

@aidanhs aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 18, 2017
@pietroalbini
Copy link
Member Author

Seems like the reviewer is taking some time off.

r? @nikomatsakis

@frewsxcv frewsxcv added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label May 22, 2017
@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented May 22, 2017

📌 Commit 93c1f24 has been approved by nikomatsakis

@nikomatsakis
Copy link
Contributor

@pietroalbini thanks! Sorry for the delay, I've been traveling. This looks good though.

@aturon aturon mentioned this pull request May 22, 2017
Closed
4 tasks
@bors
Copy link
Contributor

bors commented May 22, 2017

⌛ Testing commit 93c1f24 with merge 5eafa87...

@bors
Copy link
Contributor

bors commented May 22, 2017

💔 Test failed - status-travis

@pietroalbini
Copy link
Member Author

Ugh. Something received SIGSEGV while testing the standard library I guess. Is this a random failure?

[01:01:32] Testing libstd stage2 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-musl)
{snip}
[01:04:32] error: process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-linux-musl/release/deps/std-116dfe5a1b0286e7` (signal: 11, SIGSEGV: invalid memory reference)
[01:04:32] 
[01:04:32] To learn more, run the command again with --verbose.
[01:04:32] 
[01:04:32] 
[01:04:32] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "-j" "4" "--target" "x86_64-unknown-linux-musl" "--release" "--locked" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "--features" "panic-unwind jemalloc backtrace" "-p" "std:0.0.0" "-p" "libc:0.0.0" "-p" "rustc_lsan:0.0.0" "-p" "collections:0.0.0" "-p" "unwind:0.0.0" "-p" "rustc_msan:0.0.0" "-p" "rustc_tsan:0.0.0" "-p" "alloc_system:0.0.0" "-p" "compiler_builtins:0.0.0" "-p" "std_unicode:0.0.0" "-p" "rustc_asan:0.0.0" "-p" "rand:0.0.0" "-p" "core:0.0.0" "-p" "panic_abort:0.0.0" "-p" "alloc:0.0.0" "--"
[01:04:32] expected success, got: exit code: 101

@Mark-Simulacrum
Copy link
Member

Yeah, that's #38618.

@bors retry

frewsxcv added a commit to frewsxcv/rust that referenced this pull request May 23, 2017
@frewsxcv
Rollup merge of rust-lang#42016 - pietroalbini:stabilize/loop_break_v…
e38d5d5 
…alue, r=nikomatsakis

Stabilize the loop_break_value feature

Tracking issue: rust-lang#37339.

Documentation PRs already sent to the various repositories.
@frewsxcv frewsxcv mentioned this pull request May 23, 2017
Merged
bors added a commit that referenced this pull request May 23, 2017
@bors
Auto merge of #42165 - frewsxcv:rollup, r=frewsxcv
852b7cb 
Rollup of 8 pull requests

- Successful merges: #42016, #42122, #42144, #42145, #42151, #42152, #42160, #42163
- Failed merges:
@bors bors merged commit 93c1f24 into rust-lang:master May 23, 2017
@pietroalbini pietroalbini deleted the stabilize/loop_break_value branch May 23, 2017 11:42
@JelteF JelteF mentioned this pull request Jul 20, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@pietroalbini @rust-highfive @arielb1 @bors @nikomatsakis @Mark-Simulacrum @pnkfelix @frewsxcv @aidanhs