Skip to content

Conversation

@pietroalbini
Copy link
Member

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. 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 Jul 29, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Jul 29, 2021

📌 Commit 29ed642 has been approved by Mark-Simulacrum

@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 Jul 29, 2021
@Aaron1011
Copy link
Contributor

There are a couple of #[cfg(bootstrap)] attributes that aren't removed by this PR:

/// Same as `format_args`, but can be used in some const contexts.
#[cfg(bootstrap)]
#[unstable(feature = "const_format_args", issue = "none")]
#[macro_export]
macro_rules! const_format_args {
($($t:tt)*) => {
$crate::format_args!($($t)*)
}
}

#[cfg(bootstrap)]
fn spec_eq(a: &[T; N], b: &[U; N]) -> bool {
a[..] == b[..]
}

@bors
Copy link
Collaborator

bors commented Jul 29, 2021

⌛ Testing commit 29ed642 with merge 3c216f0...

@Mark-Simulacrum
Copy link
Member

This is for the beta branch - it shouldn't be changing cfg(bootstrap) at all. I presume a followup bump on master will happen soon.

@pietroalbini
Copy link
Member Author

Yeah I plan to do the master bump tomorrow.

@bors
Copy link
Collaborator

bors commented Jul 29, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 3c216f0 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 29, 2021
@bors bors merged commit 3c216f0 into rust-lang:beta Jul 29, 2021
@bors
Copy link
Collaborator

bors commented Jul 29, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 3c216f0 to beta...

@rustbot rustbot added this to the 1.55.0 milestone Jul 29, 2021
@pietroalbini pietroalbini deleted the stage0-dev branch May 9, 2025 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. 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.

6 participants