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.

Sign up for GitHub

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

Jump to bottom

Rollup of 7 pull requests #89207

Closed
wants to merge 17 commits into from
Closed

Rollup of 7 pull requests #89207

wants to merge 17 commits into from

Conversation

workingjubilee
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lovasoa and others added 17 commits September 3, 2021 12:14
@lovasoa
Add a better error message for rust-lang#39364
aaa6de7 
There is a known bug in the implementation of mpsc channels in rust.
This adds a clearer error message when the bug occurs, so that developers don't lose too much time looking for the origin of the bug.
See rust-lang#39364
@lovasoa
rust fmt
f63096e
@Wardenfar
Resolve issue 85066
250a3e4 
Fix : use struct_dummy

Fix different os messages
@oli-obk
More tracing instrumentation
1443de7
@hkratz
Run no_core rustdoc tests on Linux only.
da6f01d 
Windows on Macos ARM64 produce linker errors.
@TaKO8Ki
change singular to plural
b69bc84
@m-ou-se
Update library/std/src/sync/mpsc/shared.rs
598e5b2
@joshtriplett
Temporarily rename int_roundings functions to avoid conflicts
3ece63b 
These functions are unstable, but because they're inherent they still
introduce conflicts with stable trait functions in crates. Temporarily
rename them to fix these conflicts, until we can resolve those conflicts
in a better way.
@TaKO8Ki @mbartlett21
Update compiler/rustc_infer/src/infer/error_reporting/mod.rs
d997a62 
Co-authored-by: mbartlett21 <29034492+mbartlett21@users.noreply.github.com>
@estebank
Suggest _ in turbofish if param will be inferred from fn argument
affea73
@workingjubilee
Rollup merge of rust-lang#88612 - lovasoa:patch-1, r=m-ou-se
715e3e0 
Add a better error message for rust-lang#39364

There is a known bug in the implementation of mpsc channels in rust.
This adds a clearer error message when the bug occurs, so that developers don't lose too much time looking for the origin of the bug.
See rust-lang#39364
@workingjubilee
Rollup merge of rust-lang#89023 - Wardenfar:issue-85066, r=nagisa
e9d1d12 
Resolve issue : Somewhat confusing error with extended_key_value_attributes

Fixes rust-lang#85066
@workingjubilee
Rollup merge of rust-lang#89048 - oli-obk:in_tracing_we_trust, r=jack…
e8b471e 
…h726

Add more tracing instrumentation

I changed or added all this while working on a branch and pulled it out so we can merge it on its own.
@workingjubilee
Rollup merge of rust-lang#89148 - estebank:used-type-param, r=oli-obk
5f48933 
Suggest `_` in turbofish if param will be inferred from fn argument
@workingjubilee
Rollup merge of rust-lang#89171 - rusticstuff:aarch64_macos_rustdoc_c…
84e7558 
…i_fixes, r=jyn514

Run `no_core` rustdoc tests only on Linux

I don't think this is really worth investigating further so I just disabled them.

They currently fail like this:
```
error: linking with `cc` failed: exit status: 1
  |
  = note: "cc" "-Wl,-exported_symbols_list,/var/folders/pg/gjhzdz7n361f0pv665d0723w0000gn/T/rustcPUsMpx/list" "-arch" "arm64" "/Users/hans/dev/rust/build/aarch64-apple-darwin/test/rustdoc/intra-doc/prim-methods-external-core/auxiliary/my-core.my_core.9f3c60de-cgu.0.rcgu.o" "/Users/hans/dev/rust/build/aarch64-apple-darwin/test/rustdoc/intra-doc/prim-methods-external-core/auxiliary/my-core.50fu2g9urkmisdsg.rcgu.o" "-L" "/Users/hans/dev/rust/build/aarch64-apple-darwin/native/rust-test-helpers" "-L" "/Users/hans/dev/rust/build/aarch64-apple-darwin/test/rustdoc/intra-doc/prim-methods-external-core/auxiliary" "-L" "/Users/hans/dev/rust/build/aarch64-apple-darwin/stage1/lib/rustlib/aarch64-apple-darwin/lib" "-L" "/Users/hans/dev/rust/build/aarch64-apple-darwin/stage1/lib/rustlib/aarch64-apple-darwin/lib" "-o" "/Users/hans/dev/rust/build/aarch64-apple-darwin/test/rustdoc/intra-doc/prim-methods-external-core/auxiliary/libmy_core.dylib" "-Wl,-dead_strip" "-dynamiclib" "-Wl,-dylib" "-Wl,-install_name" "-Wl,`@rpath/libmy_core.dylib"` "-nodefaultlibs"
  = note: ld: dynamic main executables must link with libSystem.dylib for architecture arm64
          clang: error: linker command failed with exit code 1 (use -v to see invocation)
```

r? `@jyn514`
@workingjubilee
Rollup merge of rust-lang#89176 - TaKO8Ki:change-singular-to-plural, …
e6fe778 
…r=lcnr

Change singular to plural
@workingjubilee
Rollup merge of rust-lang#89184 - joshtriplett:master, r=estebank
d437946 
Temporarily rename int_roundings functions to avoid conflicts

These functions are unstable, but because they're inherent they still
introduce conflicts with stable trait functions in crates. Temporarily
rename them to fix these conflicts, until we can resolve those conflicts
in a better way.
@rustbot rustbot added the rollup A PR which is a rollup label Sep 23, 2021
@workingjubilee
Copy link
Member Author

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Sep 23, 2021

📌 Commit d437946 has been approved by workingjubilee

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 23, 2021
@bors
Copy link
Contributor

bors commented Sep 23, 2021

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup-db3iuf8 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-db3iuf8 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
Auto-merging compiler/rustc_trait_selection/src/opaque_types.rs
Auto-merging compiler/rustc_borrowck/src/type_check/mod.rs
CONFLICT (content): Merge conflict in compiler/rustc_borrowck/src/type_check/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

@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 Sep 23, 2021
@bors
Copy link
Contributor

bors commented Sep 23, 2021

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

@workingjubilee
Copy link
Member Author

@bors r-

@workingjubilee workingjubilee deleted the rollup-db3iuf8 branch September 24, 2021 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.