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.

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

Bump version to 1.48 and update cfg(bootstrap)s #75947

Merged
merged 3 commits into from
Aug 27, 2020

Conversation

pietroalbini
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 26, 2020
@pietroalbini
Copy link
Member Author

Also opened rust-lang/stdarch#885 to eventually remove the cfg(not(bootstrap)) from stdarch.

@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Aug 26, 2020

📌 Commit 3e16d4a 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 Aug 26, 2020
@bors
Copy link
Contributor

bors commented Aug 26, 2020

⌛ Testing commit 3e16d4a with merge fe8b2dfab7b2bef915a81d82fd83979c5e197015...

@rust-log-analyzer
Copy link
Collaborator

The job dist-mips64-linux of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
   Compiling addr2line v0.13.0
[RUSTC-TIMING] addr2line test:false 0.362
[RUSTC-TIMING] gimli test:false 4.050
[RUSTC-TIMING] object test:false 7.975
error[E0658]: `#[doc(spotlight)]` is experimental
    |
    |
488 | #[doc(spotlight)]
    |
    |
    = note: see issue #45040 <https://github.com/rust-lang/rust/issues/45040> for more information
    = help: add `#![feature(doc_spotlight)]` to the crate attributes to enable

error[E0658]: `#[doc(spotlight)]` is experimental
     |
     |
1241 | #[doc(spotlight)]
     |
     |
     = note: see issue #45040 <https://github.com/rust-lang/rust/issues/45040> for more information
     = help: add `#![feature(doc_spotlight)]` to the crate attributes to enable
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0658`.
[RUSTC-TIMING] std test:false 1.720
---
== clock drift check ==
  local time: Wed Aug 26 16:37:25 UTC 2020
  network time: Wed, 26 Aug 2020 16:37:25 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (2759) (node)
Terminate orphan process: pid (2787) (python)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Aug 26, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 26, 2020
@Mark-Simulacrum
Copy link
Member

It also looks like PR CI flaked on this somehow, but presumably unrelated?

@ollie27
Copy link
Member

ollie27 commented Aug 26, 2020

It looks like

#![cfg_attr(not(bootstrap), feature(doc_spotlight))]
was missed which explains the CI failure.

@pietroalbini
Copy link
Member Author

Woops.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Aug 27, 2020

📌 Commit 1b6590c 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 Aug 27, 2020
@bors
Copy link
Contributor

bors commented Aug 27, 2020

⌛ Testing commit 1b6590c with merge 118860a...

@bors
Copy link
Contributor

bors commented Aug 27, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 118860a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 27, 2020
@bors bors merged commit 118860a into rust-lang:master Aug 27, 2020
@pietroalbini pietroalbini deleted the bootstrap-update branch August 27, 2020 11:40
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
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.

7 participants