Skip to content

Conversation

ecstatic-morse
Copy link
Contributor

#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.

@rust-highfive
Copy link
Contributor

r? @petrochenkov

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 29, 2020
@ecstatic-morse
Copy link
Contributor Author

r? @oli-obk

@jonas-schievink
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 29, 2020

📌 Commit bb82e76 has been approved by jonas-schievink

@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 Jun 29, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 30, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jul 1, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
@bors
Copy link
Collaborator

bors commented Jul 1, 2020

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

@bors bors 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 Jul 1, 2020
@crlf0710 crlf0710 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 17, 2020
@Dylan-DPC-zz
Copy link

@ecstatic-morse if you can get this resolved, we can get this merged before more conflicts arise :)

@ecstatic-morse
Copy link
Contributor Author

@bors r=jonas-schievink

Sorry. This fell off the radar.

@bors
Copy link
Collaborator

bors commented Jul 22, 2020

📌 Commit 6100b74 has been approved by jonas-schievink

@bors
Copy link
Collaborator

bors commented Jul 22, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 22, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 22, 2020
…r=jonas-schievink

Advertise correct stable version for const control flow

rust-lang#72437 was opened before the 1.45 release but merged afterwards. These will be stable in 1.46.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2020
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#73783 (Detect when `'static` obligation might come from an `impl`)
 - rust-lang#73868 (Advertise correct stable version for const control flow)
 - rust-lang#74460 (rustdoc: Always warn when linking from public to private items)
 - rust-lang#74538 (Guard against non-monomorphized type_id intrinsic call)
 - rust-lang#74541 (Add the aarch64-apple-darwin target )
 - rust-lang#74600 (Enable perf try builder)
 - rust-lang#74618 (Do not ICE on assoc type with bad placeholder)
 - rust-lang#74631 (rustc_target: Add a target spec option for disabling `--eh-frame-hdr`)
 - rust-lang#74643 (build: Remove unnecessary `cargo:rerun-if-env-changed` annotations)

Failed merges:

r? @ghost
@bors bors merged commit da449a9 into rust-lang:master Jul 23, 2020
@ecstatic-morse ecstatic-morse deleted the fix-stable-version branch October 6, 2020 01:42
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants