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

1.19 stabilization #42745

Merged
merged 5 commits into from
Jun 28, 2017
Merged

1.19 stabilization #42745

merged 5 commits into from
Jun 28, 2017

Conversation

sfackler
Copy link
Member

@sfackler sfackler added beta-nominated Nominated for backporting to the compiler in the beta channel. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Jun 19, 2017
@bors
Copy link
Contributor

bors commented Jun 19, 2017

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

@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 19, 2017
ollie27
ollie27 reviewed Jun 19, 2017
View reviewed changes
src/libstd/collections/mod.rs
@@ -436,6 +436,8 @@ pub use self::hash_map::HashMap;
pub use self::hash_set::HashSet;

#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_deprecated(reason = "moved to std::ops", since = "1.19.0")]
#[allow(deprecated)]
pub use alloc::range;
Copy link
Member

Choose a reason for hiding this comment

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

I might be wrong but I think this reexport will have to be removed otherwise std::collections::range::RangeArgument will be usable in stable which I presume isn't intended.

Copy link
Member Author

Choose a reason for hiding this comment

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

My interpretation is that the reexport is stable but the module itself isn't (this is a weird situation to be in in the first place!), but I'm not sure.

Copy link
Member

Choose a reason for hiding this comment

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

You can use std::intrinsics::copy directly in stable Rust even though std::intrinsics is unstable so I imagine the same will happen here. I'm not sure if that's a bug though.

Copy link
Member

Choose a reason for hiding this comment

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

The range name here is already stable, so we need to leave it regardless?

Copy link
Member

@ollie27 ollie27 Jun 19, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

it doesn't look stable to me: https://doc.rust-lang.org/nightly/std/collections/range/

Edit: maybe you were referring to the #[stable(feature = "rust1", since = "1.0.0")] but it's clearly nonsense and as far as I'm aware stability attributes have no effect whatsoever on reexports.

Copy link
Member

Choose a reason for hiding this comment

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

Technically this declaration means the module itself is stable, the name std::collections::range. With no stable contents though it seems fine to just delete.

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 19, 2017
@alexcrichton
Copy link
Member

Looks good to me! Basically r=me w/ a rebase

@sfackler
Copy link
Member Author

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jun 20, 2017

📌 Commit c515712 has been approved by alexcrichton

@arielb1 arielb1 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 Jun 20, 2017
@bors
Copy link
Contributor

bors commented Jun 21, 2017

⌛ Testing commit c515712abf1f5a4e00d3362857c936c9a136a7a4 with merge 9739355ba6f08365dbe5125b616a0a4c55738bf4...

@bors
Copy link
Contributor

bors commented Jun 21, 2017

💔 Test failed - status-travis

@arielb1
Copy link
Contributor

arielb1 commented Jun 21, 2017

real failure:

[01:14:44] failures:
[01:14:44] 
[01:14:44] ---- ops/range.rs - ops::range::RangeArgument::end (line 396) stdout ----
[01:14:44] 	error: unexpected close delimiter: `}`
[01:14:44]   --> <anon>:10:1
[01:14:44]    |
[01:14:44] 10 | 
[01:14:44]    | ^
[01:14:44] 
[01:14:44] thread 'rustc' panicked at 'Box<Any>', /checkout/src/libsyntax/parse/mod.rs:218
[01:14:44] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:14:44] thread 'rustc' panicked at 'couldn't compile the test', /checkout/src/librustdoc/test.rs:278
[01:14:44] 
[01:14:44] ---- ops/range.rs - ops::range::RangeArgument::start (line 379) stdout ----
[01:14:44] 	error: unexpected close delimiter: `}`
[01:14:44]   --> <anon>:10:1
[01:14:44]    |
[01:14:44] 10 | }
[01:14:44]    | ^

@alexcrichton alexcrichton added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 22, 2017
@brson brson mentioned this pull request Jun 22, 2017
Closed
@bors
Copy link
Contributor

bors commented Jun 23, 2017

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

@sfackler
Copy link
Member Author

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jun 25, 2017

📌 Commit 143206d has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jun 25, 2017

⌛ Testing commit 143206d with merge 47a23a291ec33f4d7b1a9e0d4ebe04f555bd4a0d...

@Mark-Simulacrum
Copy link
Member

Okay, that's the third time with the same error. Not going to retry.. cc @alexcrichton

@alexcrichton
Copy link
Member

@bors: retry

That... should be spurious :(

If it keeps bouncing though this can update Cargo to pull in rust-lang/cargo#4218 which disables the test.

@bors
Copy link
Contributor

bors commented Jun 26, 2017

⌛ Testing commit 143206d with merge 1dfcf8788539bb553366f27bbc84d65d8f4e4430...

@bors
Copy link
Contributor

bors commented Jun 26, 2017

💔 Test failed - status-appveyor

@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jun 26, 2017
Merged
@sfackler
Copy link
Member Author

Looks like another failure on that test. We should probably bump Cargo.

@Mark-Simulacrum
Copy link
Member

Filed #42916 to update Cargo -- I don't want to do that here because of the beta-nominated status for now at least, we can rather pull in an extra PR for that. I'm waiting on @alexcrichton or someone else to r+ the update.

@alexcrichton
Copy link
Member

@bors: retry

bors added a commit that referenced this pull request Jun 26, 2017
@bors
Auto merge of #42916 - Mark-Simulacrum:update-cargo, r=alexcrichton
77931c2 
Update Cargo

Haven't run extensive tests locally (not really sure what to test) but this primarily pulls in minor changes: rust-lang/cargo#4215, rust-lang/cargo#4209, and rust-lang/cargo#4218. The last one fixes the flaky cargo test by ignoring it, which should unblock #42745 -- that's beta nominated.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Jun 27, 2017

⌛ Testing commit 143206d with merge 01134ea93735a079a8373e10ddbdece018530209...

@bors
Copy link
Contributor

bors commented Jun 27, 2017

💔 Test failed - status-travis

@Mark-Simulacrum
Copy link
Member

@bors retry

os x timeout

@arielb1 arielb1 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 27, 2017
@bors
Copy link
Contributor

bors commented Jun 28, 2017

⌛ Testing commit 143206d with merge c169307...

bors added a commit that referenced this pull request Jun 28, 2017
@bors
Auto merge of #42745 - sfackler:1.19-stabilization, r=alexcrichton
c169307 
1.19 stabilization

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Jun 28, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing c169307 to master...

@bors bors merged commit 143206d into rust-lang:master Jun 28, 2017
@kennytm kennytm mentioned this pull request Jul 3, 2017
Closed
@brson brson mentioned this pull request Jul 8, 2017
Merged
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 13, 2017
bors added a commit that referenced this pull request Jul 13, 2017
@bors
Auto merge of #43114 - brson:beta-next, r=brson
8537f4e 
[beta] backports

- #43068
- #43043
- #42745

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.
bors added a commit that referenced this pull request Jul 13, 2017
@bors
Auto merge of #43114 - brson:beta-next, r=alexcrichton
23542f5 
[beta] backports

- #43068
- #43043
- #42745

The pick of 143206d in cfa3b58 was not clean and needed a fair bit of surgery. It should probably be looked at closely.

Still testing locally.
@dtolnay dtolnay mentioned this pull request Sep 17, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexcrichton alexcrichton alexcrichton left review comments

@ollie27 ollie27 ollie27 left review comments

Assignees

@alexcrichton alexcrichton

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.
8 participants
@sfackler @bors @alexcrichton @arielb1 @Mark-Simulacrum @ollie27 @brson @carols10cents