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

Changelog: Demonstrate final build-override syntax #68603

Merged
merged 1 commit into from
Jan 29, 2020
Merged

Changelog: Demonstrate final build-override syntax #68603

merged 1 commit into from
Jan 29, 2020

Conversation

kornelski
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 28, 2020
@jonas-schievink jonas-schievink added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Jan 28, 2020
@Centril
Copy link
Contributor

Centril commented Jan 28, 2020

r? @Mark-Simulacrum @pietroalbini

@Mark-Simulacrum
Copy link
Member

Please switch the target branch to master so that this can get rolled up. We'll target the master branch from the blog post.

@kornelski kornelski changed the base branch from stable to master January 28, 2020 17:43
@bors
Copy link
Contributor

bors commented Jan 28, 2020

☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts.

@pietroalbini
Copy link
Member

@bors r+ rollup
@rustbot modify-labels: beta-nominated beta-accepted stable-nominated stable-accepted

@bors
Copy link
Contributor

bors commented Jan 29, 2020

📌 Commit efb1acf has been approved by pietroalbini

@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 Jan 29, 2020
@pietroalbini pietroalbini added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jan 29, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 29, 2020
@JohnTitor
Rollup merge of rust-lang#68603 - kornelski:patch-1, r=pietroalbini
95e7342 
Changelog: Demonstrate final build-override syntax
@JohnTitor JohnTitor mentioned this pull request Jan 29, 2020
Merged
bors added a commit that referenced this pull request Jan 29, 2020
@bors
Auto merge of #68635 - JohnTitor:rollup-jsc34ac, r=JohnTitor
eed12bc 
Rollup of 7 pull requests

Successful merges:

 - #67722 (Minor: note how Any is an unsafe trait in SAFETY comments)
 - #68586 (Make conflicting_repr_hints a deny-by-default c-future-compat lint)
 - #68598 (Fix null synthetic_implementors error)
 - #68603 (Changelog: Demonstrate final build-override syntax)
 - #68609 (Set lld flavor for MSVC to link.exe)
 - #68611 (Correct ICE caused by macros generating invalid spans.)
 - #68627 (Document that write_all will not call write if given an empty buffer)

Failed merges:

r? @ghost
@bors bors merged commit efb1acf into rust-lang:master Jan 29, 2020
@kornelski kornelski deleted the patch-1 branch January 29, 2020 17:35
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 6, 2020
Merged
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Feb 6, 2020
bors added a commit that referenced this pull request Feb 7, 2020
@bors
Auto merge of #68906 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
86f329b 
[beta] backports

*  Update jobserver crate to 0.1.21 #68663
* Changelog: Demonstrate final build-override syntax #68603
*  [beta] Update cargo #68900
* Uses static.r-l.o instead of dev-static as well.
@Mark-Simulacrum Mark-Simulacrum removed the stable-nominated Nominated for backporting to the compiler in the stable channel. label Feb 21, 2020
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 21, 2020
Merged
bors added a commit that referenced this pull request Feb 22, 2020
@bors
Auto merge of #69359 - Mark-Simulacrum:stable-next, r=<try>
9ab2cd6 
[stable] 1.41.1 release

This backports the following PRs:
 * Revert "Remove `checked_add` in `Layout::repeat`" #69241
 * Do not ICE when encountering `yield` inside `async` block #69175
 * Correct ICE caused by macros generating invalid spans. #68611
 * Changelog: Demonstrate final build-override syntax #68603
 * Resolve long compile times when evaluating always valid constants #67667
 * Fix MIR typeck soundness holes #69145

This also includes a commit which rustfmt's files which the latter commits touched (and perhaps a bit more) to make rebasing the PRs go more smoothly (thankfully, this should be the last time we need to do so).

I have removed stable-nominated tags from PRs successfully backported.
bors added a commit that referenced this pull request Feb 24, 2020
@bors
Auto merge of #69359 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
ded0270 
[stable] 1.41.1 release

This backports the following PRs:
 * Revert "Remove `checked_add` in `Layout::repeat`" #69241
 * Do not ICE when encountering `yield` inside `async` block #69175
 * Correct ICE caused by macros generating invalid spans. #68611
 * Changelog: Demonstrate final build-override syntax #68603
 * Resolve long compile times when evaluating always valid constants #67667
 * Fix MIR typeck soundness holes #69145

This also includes a commit which rustfmt's files which the latter commits touched (and perhaps a bit more) to make rebasing the PRs go more smoothly (thankfully, this should be the last time we need to do so).

I have removed stable-nominated tags from PRs successfully backported.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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. stable-accepted Accepted for backporting to the compiler in the stable channel. T-release Relevant to the release subteam, 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
@kornelski @rust-highfive @Centril @Mark-Simulacrum @bors @pietroalbini @nikomatsakis @jonas-schievink