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

Stage0 step #66156

Merged
merged 5 commits into from
Nov 13, 2019
Merged

Stage0 step #66156

merged 5 commits into from
Nov 13, 2019

Conversation

Mark-Simulacrum
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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.
2019-11-06T13:22:36.2928244Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-06T13:22:36.3174122Z ##[command]git config gc.auto 0
2019-11-06T13:22:36.3250158Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-06T13:22:36.3317967Z ##[command]git config --get-all http.proxy
2019-11-06T13:22:36.3440178Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66156/merge:refs/remotes/pull/66156/merge
---
2019-11-06T14:11:35.9231068Z   local time: Wed Nov  6 14:11:35 UTC 2019
2019-11-06T14:11:36.4454033Z   network time: Wed, 06 Nov 2019 14:11:36 GMT
2019-11-06T14:11:36.4457850Z == end clock drift check ==
2019-11-06T14:11:38.1007936Z 
2019-11-06T14:11:38.1069946Z ##[error]Bash exited with code '1'.
2019-11-06T14:11:38.1133488Z ##[section]Starting: Checkout
2019-11-06T14:11:38.1135421Z ==============================================================================
2019-11-06T14:11:38.1135490Z Task         : Get sources
2019-11-06T14:11:38.1135552Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 7, 2019

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

@Mark-Simulacrum
Copy link
Member Author

Rebased. Somehow on_unimplemented de-stabilized? Not sure.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 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.
2019-11-07T12:22:23.8419570Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-11-07T12:22:23.8606764Z ##[command]git config gc.auto 0
2019-11-07T12:22:23.8687312Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-11-07T12:22:23.8720475Z ##[command]git config --get-all http.proxy
2019-11-07T12:22:23.8889733Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/66156/merge:refs/remotes/pull/66156/merge
---
2019-11-07T12:29:07.3286250Z    Compiling panic_abort v0.0.0 (/checkout/src/libpanic_abort)
2019-11-07T12:29:07.4751091Z    Compiling backtrace v0.3.40
2019-11-07T12:29:08.0272946Z    Compiling rustc-std-workspace-alloc v1.99.0 (/checkout/src/tools/rustc-std-workspace-alloc)
2019-11-07T12:29:08.2112142Z    Compiling panic_unwind v0.0.0 (/checkout/src/libpanic_unwind)
2019-11-07T12:29:09.9519970Z error[E0658]: the `#[rustc_on_unimplemented]` attribute is an experimental feature
2019-11-07T12:29:09.9521616Z     |
2019-11-07T12:29:09.9522288Z 105 | / #[rustc_on_unimplemented(
2019-11-07T12:29:09.9522288Z 105 | / #[rustc_on_unimplemented(
2019-11-07T12:29:09.9523344Z 106 | |     message="the type `{Self}` may not be safely transferred across an unwind boundary",
2019-11-07T12:29:09.9524034Z 107 | |     label="`{Self}` may not be safely transferred across an unwind boundary",
2019-11-07T12:29:09.9524673Z 108 | | )]
2019-11-07T12:29:09.9525314Z     | |__^
2019-11-07T12:29:09.9525916Z     |
2019-11-07T12:29:09.9526700Z     = note: for more information, see ***/issues/29628
2019-11-07T12:29:09.9527230Z     = help: add `#![feature(on_unimplemented)]` to the crate attributes to enable
2019-11-07T12:29:09.9527401Z 
2019-11-07T12:29:09.9527849Z error[E0658]: the `#[rustc_on_unimplemented]` attribute is an experimental feature
2019-11-07T12:29:09.9528591Z     |
2019-11-07T12:29:09.9529035Z 123 | / #[rustc_on_unimplemented(
2019-11-07T12:29:09.9529035Z 123 | / #[rustc_on_unimplemented(
2019-11-07T12:29:09.9529593Z 124 | |     message="the type `{Self}` may contain interior mutability and a reference may not be safely \
2019-11-07T12:29:09.9530139Z 125 | |              transferrable across a catch_unwind boundary",
2019-11-07T12:29:09.9530838Z 126 | |     label="`{Self}` may contain interior mutability and a reference may not be safely \
2019-11-07T12:29:09.9531322Z 127 | |            transferrable across a catch_unwind boundary",
2019-11-07T12:29:09.9531762Z 128 | | )]
2019-11-07T12:29:09.9532160Z     | |__^
2019-11-07T12:29:09.9532512Z     |
2019-11-07T12:29:09.9532999Z     = note: for more information, see ***/issues/29628
2019-11-07T12:29:09.9533471Z     = help: add `#![feature(on_unimplemented)]` to the crate attributes to enable
2019-11-07T12:29:09.9533666Z 
2019-11-07T12:29:09.9579890Z error[E0658]: the `#[rustc_on_unimplemented]` attribute is an experimental feature
2019-11-07T12:29:09.9580893Z      |
2019-11-07T12:29:09.9581374Z 1606 | / #[rustc_on_unimplemented(
2019-11-07T12:29:09.9581374Z 1606 | / #[rustc_on_unimplemented(
2019-11-07T12:29:09.9581881Z 1607 | |   message="`main` has invalid return type `{Self}`",
2019-11-07T12:29:09.9582431Z 1608 | |   label="`main` can only return types that implement `{Termination}`")]
2019-11-07T12:29:09.9583305Z      |
2019-11-07T12:29:09.9583305Z      |
2019-11-07T12:29:09.9583845Z      = note: for more information, see ***/issues/29628
2019-11-07T12:29:09.9584355Z      = help: add `#![feature(on_unimplemented)]` to the crate attributes to enable
2019-11-07T12:29:12.0106781Z error: aborting due to 3 previous errors
2019-11-07T12:29:12.0107665Z 
2019-11-07T12:29:12.0108320Z For more information about this error, try `rustc --explain E0658`.
2019-11-07T12:29:12.0470608Z error: could not compile `std`.
---
2019-11-07T12:29:12.0588829Z   local time: Thu Nov  7 12:29:12 UTC 2019
2019-11-07T12:29:12.2069520Z   network time: Thu, 07 Nov 2019 12:29:12 GMT
2019-11-07T12:29:12.2091825Z == end clock drift check ==
2019-11-07T12:29:15.1993102Z 
2019-11-07T12:29:15.2089323Z ##[error]Bash exited with code '1'.
2019-11-07T12:29:15.2117525Z ##[section]Starting: Checkout
2019-11-07T12:29:15.2119190Z ==============================================================================
2019-11-07T12:29:15.2119409Z Task         : Get sources
2019-11-07T12:29:15.2119459Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

@Mark-Simulacrum
Copy link
Member Author

@Centril I can't seem to get on_unimplemented working -- if I remove it, then I get:

error[E0658]: the `#[rustc_on_unimplemented]` attribute is an experimental feature
    --> src/libstd/process.rs:1606:1
     |
1606 | / #[rustc_on_unimplemented(
1607 | |   message="`main` has invalid return type `{Self}`",
1608 | |   label="`main` can only return types that implement `{Termination}`")]
     | |_______________________________________________________________________^
     |
     = note: for more information, see https://github.com/rust-lang/rust/issues/29628
     = help: add `#![feature(on_unimplemented)]` to the crate attributes to enable

but if I leave it in, then I get:

error[E0557]: feature has been removed
   --> src/libstd/lib.rs:286:12
    |
286 | #![feature(on_unimplemented)]
    |            ^^^^^^^^^^^^^^^^ feature has been removed

error: aborting due to previous error

@Centril
Copy link
Contributor

Centril commented Nov 7, 2019

@Mark-Simulacrum Odd; What I did in #65794 was to move the attribute under #![feature(rustc_attrs)].

@Mark-Simulacrum
Copy link
Member Author

libstd does have the rustc_attrs attribute. I wonder if maybe I should keep the cfg(bootstrap) around...

@Centril
Copy link
Contributor

Centril commented Nov 7, 2019

Sure, if that makes things compile, why not. We can remove it next time. :)

@Mark-Simulacrum
Copy link
Member Author

@pietroalbini Okay, looks like this is compiling successfully now.

@pietroalbini
Copy link
Member

Sorry for the delay reviewing this!

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Nov 12, 2019

📌 Commit f4de4618207160f8e421e0a6d25c3ce9cbd03415 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 Nov 12, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors p=1

We should try to get nightly version bumped as soon as possible.

@bors
Copy link
Contributor

bors commented Nov 12, 2019

⌛ Testing commit f4de4618207160f8e421e0a6d25c3ce9cbd03415 with merge b7dc243ca82da771aa8ef10e43682395bd9d792e...

@rust-highfive
Copy link
Collaborator

The job x86_64-msvc-cargo 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.
2019-11-12T21:26:03.8103783Z    Compiling panic_unwind v0.0.0 (D:\a\1\s\src\libpanic_unwind)
2019-11-12T21:26:03.8103902Z error: variable does not need to be mutable
2019-11-12T21:26:03.8104178Z    --> src\libpanic_unwind\seh.rs:225:9
2019-11-12T21:26:03.8104263Z     |
2019-11-12T21:26:03.8104449Z 225 |     let mut ptrs_ptr = ptrs.as_mut_ptr();
2019-11-12T21:26:03.8104869Z     |         |
2019-11-12T21:26:03.8105018Z     |         help: remove this `mut`
2019-11-12T21:26:03.8105114Z     |
2019-11-12T21:26:03.8105236Z     = note: `-D unused-mut` implied by `-D warnings`
---
2019-11-12T21:26:03.8107113Z   local time: Tue Nov 12 21:26:03 CUT 2019
2019-11-12T21:26:03.8107195Z   network time: Tue, 12 Nov 2019 21:26:03 GMT
2019-11-12T21:26:03.8107287Z == end clock drift check ==
2019-11-12T21:26:03.8107335Z 
2019-11-12T21:26:03.8741721Z ##[error]Bash exited with code '1'.
2019-11-12T21:26:03.8877452Z ##[section]Starting: Checkout
2019-11-12T21:26:03.8991456Z ==============================================================================
2019-11-12T21:26:03.8991570Z Task         : Get sources
2019-11-12T21:26:03.8991654Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Nov 12, 2019

💔 Test failed - checks-azure

@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 Nov 12, 2019
It's super unclear why this broke when we switched to beta but not
previously -- but at least it's hopefully fixed now.
@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Nov 12, 2019

📌 Commit 994d836 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 Nov 12, 2019
@bors
Copy link
Contributor

bors commented Nov 13, 2019

⌛ Testing commit 994d836 with merge 0f12bad...

bors added a commit that referenced this pull request Nov 13, 2019
@bors
Copy link
Contributor

bors commented Nov 13, 2019

☀️ Test successful - checks-azure
Approved by: pietroalbini
Pushing 0f12bad to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 13, 2019
@bors bors merged commit 994d836 into rust-lang:master Nov 13, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the stage0-step branch November 13, 2019 13:26
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.

5 participants