Join GitHub today
GitHub is home to over 31 million developers working together to host and review code, manage projects, and build software together.
Sign up[beta] Backport accepted PRs to 1.21 #44823
Conversation
budziq
and others
added some commits
Sep 14, 2017
dtolnay
requested a review
from
alexcrichton
Sep 25, 2017
dtolnay
referenced this pull request
Sep 25, 2017
Closed
Backport libs stabilizations to 1.21 beta #44824
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")] | |||
This comment has been minimized.
This comment has been minimized.
kennytm
Sep 25, 2017
•
Member
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
|
r=me wit hthe tidy error fixed, thanks @dtolnay! |
carols10cents
added
the
S-waiting-on-author
label
Sep 25, 2017
carols10cents
assigned
alexcrichton
Sep 25, 2017
This comment has been minimized.
This comment has been minimized.
|
@bors r=alexcrichton |
This comment has been minimized.
This comment has been minimized.
|
|
This comment has been minimized.
This comment has been minimized.
|
@bors: r- backport fails to compile? |
dtolnay
added some commits
Sep 25, 2017
dtolnay
force-pushed the
dtolnay:backport21
branch
from
a03e765
to
f38d353
Sep 26, 2017
This comment has been minimized.
This comment has been minimized.
|
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
}, |
This comment has been minimized.
This comment has been minimized.
|
@bors: r+ |
This comment has been minimized.
This comment has been minimized.
|
|
This comment has been minimized.
This comment has been minimized.
|
@bors: p=1 (backport) |
alexcrichton
referenced this pull request
Sep 26, 2017
Merged
don't suggest placing `use` statements into expanded code #44215
This comment has been minimized.
This comment has been minimized.
bors
added a commit
that referenced
this pull request
Sep 26, 2017
This comment has been minimized.
This comment has been minimized.
|
|
bors
merged commit f38d353
into
rust-lang:beta
Sep 26, 2017
dtolnay
deleted the
dtolnay:backport21
branch
Sep 26, 2017
Mark-Simulacrum
added a commit
to Mark-Simulacrum/rust
that referenced
this pull request
Sep 29, 2017
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.
dtolnay commentedSep 25, 2017
•
edited
Backport of:
don't suggest placingusestatements into expanded code #44215