[beta] Backport accepted PRs to 1.21 #44823
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Most of the other rust-lang buckets are in us-west-1 and I think the original bucket was just accidentally created in the us-east-1 region. Let's consolidate by moving it to the same location as the rest of our buckets.
updated clippy and rls as it uses the iterator_for_each
Moving buckets from us-east-1 to us-west-1 because us-west-1 is where rust-central-station itself runs and in general is where we have all our other buckets.
kennytm
reviewed
Sep 25, 2017
| @@ -1420,7 +1420,7 @@ impl String { | |||
| /// assert_eq!(t, "α is alpha, "); | |||
| /// assert_eq!(s, "Α is capital alpha; β is beta"); | |||
| /// ``` | |||
| #[unstable(feature = "splice", reason = "recently added", issue = "32310")] | |||
| #[unstable(feature = "splice", reason = "recently added", issue = "44643")] | |||
There was a problem hiding this comment.
Please update https://github.com/dtolnay/rust/blob/5f502de51dd01b3bf06f874b87702445a0ae8d90/src/liballoc/string.rs#L2253 as well.
[00:04:19] tidy error: /checkout/src/liballoc/string.rs:2253: mismatches to previous in: ["tracking issue"]
alexcrichton
approved these changes
Sep 25, 2017
carols10cents
added
the
S-waiting-on-author
|
@bors r=alexcrichton |
|
📌 Commit a03e765 has been approved by |
|
@bors: r- backport fails to compile? |
This includes the following stabilizations: - tcpstream_connect_timeout rust-lang#44563 - iterator_for_each rust-lang#44567 - ord_max_min rust-lang#44593 - compiler_fences rust-lang#44595 - needs_drop rust-lang#44639 - vec_splice rust-lang#44640
I backported the stabilization of Vec::splice and the move of String::splice to the new tracking issue, but not the new signature of String::splice in 1.22. This combination requires updating the tracking issue on some code that no longer exists in nightly.
|
I removed the backport of #44215 from this PR, will leave that one to someone else. (expand) Here is the merge I botched. match item.node {
ItemKind::Use(..) => {
// don't suggest placing a use before the prelude
// import or other generated ones
<<<<<<< HEAD
if item.span == DUMMY_SP {
let mut span = item.span;
span.hi = span.lo;
self.span = Some(span);
||||||| parent of 74748b11bb3... WIP: don't suggest placing `use` statements into expanded code
if item.span == DUMMY_SP {
self.span = Some(item.span.with_hi(item.span.lo()));
=======
if item.span.ctxt().outer().expn_info().is_none() {
self.span = Some(item.span.with_hi(item.span.lo()));
>>>>>>> 74748b11bb3... WIP: don't suggest placing `use` statements into expanded code
self.found_use = true;
return;
}
},
// don't place use before extern crate
ItemKind::ExternCrate(_) => {}
// but place them before the first other item
_ => if self.span.map_or(true, |span| item.span < span ) {
<<<<<<< HEAD
let mut span = item.span;
span.hi = span.lo;
self.span = Some(span);
||||||| parent of 74748b11bb3... WIP: don't suggest placing `use` statements into expanded code
self.span = Some(item.span.with_hi(item.span.lo()));
=======
if item.span.ctxt().outer().expn_info().is_none() {
// don't insert between attributes and an item
if item.attrs.is_empty() {
self.span = Some(item.span.with_hi(item.span.lo()));
} else {
// find the first attribute on the item
for attr in &item.attrs {
if self.span.map_or(true, |span| attr.span < span) {
self.span = Some(attr.span.with_hi(attr.span.lo()));
}
}
}
}
>>>>>>> 74748b11bb3... WIP: don't suggest placing `use` statements into expanded code
}, |
|
@bors: r+ |
|
📌 Commit f38d353 has been approved by |
|
@bors: p=1 (backport) |
bors
added a commit
that referenced
this pull request
Sep 26, 2017
[beta] Backport accepted PRs to 1.21 Backport of: - ~don't suggest placing `use` statements into expanded code #44215 - stabilize tcpstream_connect_timeout #44563 - stabilized iterator_for_each #44567 - travis: Move sccache to the us-west-1 region #44574 - stabilized ord_max_min #44593 - stabilized compiler_fences #44595 - ci: Upload/download from a new S3 bucket #44617 - stabilized needs_drop #44639 - Stabilized vec_splice and modified splice tracking issue #44640 - Backport libs stabilizations to 1.21 beta #44824
|
☀️ Test successful - status-appveyor, status-travis |
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Sep 29, 2017
Backport libs stabilizations to 1.21 beta Includes the following stabilizations: - tcpstream_connect_timeout rust-lang#44563 - iterator_for_each rust-lang#44567 - ord_max_min rust-lang#44593 - compiler_fences rust-lang#44595 - needs_drop rust-lang#44639 - vec_splice rust-lang#44640 These have been backported in rust-lang#44823.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of:
don't suggest placingusestatements into expanded code don't suggest placingusestatements into expanded code #44215