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

[beta] next #79075

Merged
merged 22 commits into from
Nov 15, 2020
Merged

[beta] next #79075

merged 22 commits into from
Nov 15, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Nov 15, 2020

This backports:

For RLS/rustfmt compilation to succeed:

As a dependency of #77801:

Mark-Simulacrum and others added 4 commits November 15, 2020 09:32
If the LLVM was externally provided, then we don't currently copy artifacts into
the sysroot. This is not necessarily the right choice (in particular, it will
require the LLVM dylib to be in the linker's load path at runtime), but the
common use case for external LLVMs is distribution provided LLVMs, and in that
case they're usually in the standard search path (e.g., /usr/lib) and copying
them here is going to cause problems as we may end up with the wrong files and
isn't what distributions want.

This behavior may be revisited in the future though.
…n one more case""

This reverts commit b20bce8.

It retains the test added in that commit as a check-pass test, intended to
prevent future (unintentional) regressions.
@rust-highfive
Copy link
Collaborator

⚠️ 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!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 15, 2020
@Mark-Simulacrum
Copy link
Member Author

cc @Xanewok @calebcartwright the submodule bump of RLS and rustfmt didn't merge cleanly; this PR sets RLS to rust-lang/rls@dab1468 which is the same as that PR bumped to but the "from" on that is different. I'm not sure if that's correct, please let me know if not ASAP (we expect to build artifacts tomorrow).

@Mark-Simulacrum
Copy link
Member Author

I backported " change the order of type arguments on ControlFlow #76614 " and " Add ControlFlow::is_{break,continue} methods #78200 " to hopefully fix rls compilation here, because I'd rather backport those two PRs rather than deal with RLS bumping.

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools 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.
Initialized empty Git repository in /home/runner/work/rust/rust/.git/
##[command]git remote add origin https://github.com/rust-lang/rust
##[command]git config gc.auto 0
##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/79075/merge:refs/remotes/pull/79075/merge
---
   Compiling hashbrown v0.9.0
   Compiling miniz_oxide v0.4.0
   Compiling object v0.20.0
   Compiling addr2line v0.13.0
error[E0599]: no function or associated item named `static_ref` found for struct `core::pin::Pin<_>` in the current scope
    |
    |
568 |         inner: Pin::static_ref(&INSTANCE).get_or_init_pin(
    |                     ^^^^^^^^^^ function or associated item not found in `core::pin::Pin<_>`

error[E0599]: no function or associated item named `static_ref` found for struct `core::pin::Pin<_>` in the current scope
    |
    |
561 |             if let Some(lock) = Pin::static_ref(instance).try_lock() {
    |                                      ^^^^^^^^^^ function or associated item not found in `core::pin::Pin<_>`

error[E0599]: no function or associated item named `static_ref` found for struct `core::pin::Pin<_>` in the current scope
    |
    |
768 |         inner: Pin::static_ref(&INSTANCE).get_or_init_pin(
    |                     ^^^^^^^^^^ function or associated item not found in `core::pin::Pin<_>`
error: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0599`.
error: could not compile `std`.

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)

m-ou-se and others added 7 commits November 15, 2020 11:03
Co-authored-by: Peter Todd <pete@petertodd.org>
Co-authored-by: David Tolnay <dtolnay@gmail.com>
RunCompiler::new takes non-optional params, and optional
params can be set using set_*field_name* method.
finally `run` will forward all fields to `run_compiler`.
@calebcartwright
Copy link
Member

Seems like you might've resolved it already but definitely makes sense that #76614 would be needed, and I'd imagine #77649 as well

@Mark-Simulacrum
Copy link
Member Author

Yep, looks like tests are passing here now so I will @bors r+ rollup=never p=1

Will also go back through the listed PRs and bump milestones and set labels as appropriate.

@bors
Copy link
Contributor

bors commented Nov 15, 2020

📌 Commit d9beaaf 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 Nov 15, 2020
@bors
Copy link
Contributor

bors commented Nov 15, 2020

⌛ Testing commit d9beaaf with merge 63dddf28d104c094812e51617b00cccc25ae04a4...

@bors
Copy link
Contributor

bors commented Nov 15, 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 Nov 15, 2020
@calebcartwright
Copy link
Member

May need #77837 too?

@Mark-Simulacrum
Copy link
Member Author

Miri isn't distributed on beta/stable so we shouldn't need a bump. I've pushed a commit patching over the problem (hopefully) on this branch, will take a closer look over the next cycle hopefully.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 15, 2020

📌 Commit 0b6785f 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 Nov 15, 2020
@bors
Copy link
Contributor

bors commented Nov 15, 2020

⌛ Testing commit 0b6785f with merge 8236dc0...

@bors
Copy link
Contributor

bors commented Nov 15, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 15, 2020
@bors bors merged commit 8236dc0 into rust-lang:beta Nov 15, 2020
@rustbot rustbot added this to the 1.48.0 milestone Nov 15, 2020
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch December 4, 2020 02:25
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.