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

Rollup of 9 pull requests #103553

Closed

Conversation

compiler-errors
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fee1-dead and others added 21 commits October 22, 2022 13:54
This patch makes it possible to use varargs for calling conventions,
which are either based on C (like efiapi) or C is based
on them (for example sysv64 and win64).
Use ticks around abis.

Co-authored-by: Esteban Kuber <estebank@users.noreply.github.com>
Its usage was removed in 5e624bf and 093b075, so we do not need to
keep it around any longer. According to [preliminary
input](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Find.20.60rustc_driver.60.20dependent.20projects.3F/near/304490764),
we do not need to worry about any deprecation cycle for this API and can
just straight up remove it.

Migration instructions for remaining clients
--------------------------------------------

Change from

```rust

extern crate rustc_driver;

fn main() {
    rustc_driver::set_sigpipe_handler();
    // ...
```

to

```rust

fn main() {
    // ...
```
…ry_enum_discriminant, r=joshtriplett

Stabilize arbitrary_enum_discriminant, take 2

Documentation has been updated in rust-lang/reference#1055. cc rust-lang#86860 for previous stabilization report.

Not yet marks rust-lang#60553 as done: need documentation in the rust reference.
Enable varargs support for calling conventions other than C or cdecl

This patch makes it possible to use varargs for calling conventions,
which are either based on C (efiapi) or C is based on them (sysv64 and win64).

Also pinging `@phlopsi,` because he noticed first this oversight when writing a library for UEFI.
privacy: Rename "accessibility levels" to "effective visibilities"

And a couple of other naming and comment tweaks.

Related to rust-lang#48054

For `enum Level` I initially used naming `enum EffectiveVisibilityLevel`, but it was too long and inconvenient because it's used pretty often.
So I shortened it to just `Level`, if it needs to be used from some context where this name would be ambiguous, then it can be imported with renaming like `use rustc_middle::privacy::Level as EffVisLevel` or something.
…llot

Name the `impl Trait` in region bound suggestions

Slightly more descriptive message
Use &self instead of &mut self for cast methods

r? `@oli-obk`
…, r=tmiasko

Remove `rustc_driver::set_sigpipe_handler()`

Its usage was removed in rust-lang#102587 and rust-lang#103495, so we do not need to keep it around any longer. According to [preliminary input](https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/Find.20.60rustc_driver.60.20dependent.20projects.3F/near/304490764), we do not need to worry about any deprecation cycle for this explicitly unstable API, and can just straight up remove it.

PR that added `set_sigpipe_handler`: rust-lang#49606

Tracking issue for `unix_sigpipe`: rust-lang#97889

Migration instructions for any remaining clients
---

Change from

```rust
#![feature(rustc_private)]

extern crate rustc_driver;

fn main() {
    rustc_driver::set_sigpipe_handler();
    // ...
```

to

```rust
#![feature(unix_sigpipe)]

#[unix_sigpipe = "sig_dfl"]
fn main() {
    // ...
```

`@rustbot` labels +T-compiler
…=compiler-errors

Pinning tests for some `macro_rules!` errors discussed in the lang meeting

r? `@nikomatsakis`

Mind just stamping these, since they were useful for the meeting discussion today?
Update books

## reference

4 commits in f6ed74f582bddcec73f753eafaab3749c4f7df61..4ea7c5def38ac81df33a9e48e5637a82a5ac404d
2022-10-08 02:43:26 -0700 to 2022-10-25 15:14:36 -0700
- Document Half Open Range Patterns + Improve Range Patterns in General (rust-lang/reference#1274)
- clarifying which row contains the example (rust-lang/reference#1287)
- Add `sym` operands for inline assembly (rust-lang/reference#1270)
- Add basic GATs reference information (rust-lang/reference#1265)

## book

141 commits in f1e5ad844d0c61738006cdef26227beeb136948e..aa5ee485bd6bd80d205da7c82fcdd776f92fdd51
2022-09-19 09:48:21 -0400 to 2022-10-20 16:49:55 -0400
- Remove Turkish translation
- Update chapter 4 from latest print edits
- Update chapter 3 from latest print edits
- Clarify division truncates toward zero. Fixes rust-lang/book#2856.
- Update chapter 2 from latest print edits
- Fix a problem with literal style ending
- Explain both kinds of format string arguments
- Update chapter 1 from latest print edits
- Snapshot consolidated appendices
- Fix ListNumber0, newlines after lists
- Don't match nodes without anything
- Handle listing numbers in appendices too
- Regenerate everything
- Fix chapter numbers in word doc so they're in the XML
- Number Table captions too
- Handle figures too
- Regenerate ch4
- Handle listing numbers
- Regenerate ch13
- Regenerate ch12
- Regenerate ch11
- Regenerate chapter 10
- Fix ListBullet0
- Handle ending of BoxCode better
- Regenerate chapter 9
- Regenerate ch8
- Make RunInHead consistent-ish
- Fix extra newline before boxes
- Fix Box RunIn Head/Para
- Fix newline after RunInHead/Para
- Regenerate ch7
- Fix QuotePara
- Fix ListPlain
- Regenerate ch6
- Fix BoxCode
- Regenerate chapter 5
- Fix GraphicSlug and CaptionLine
- Regenerate snapshot of chapter 4
- Fix boxes a bit
- Add a shellcheck ignore
- Handle BoxListBullet
- Handle superscript
- Regenerate ch3 from xml and fix tables
- Fix italics and whitespace interactions
- Fix italic preceding/following
- Fix preceding/following xpaths again
- Fix italics
- Fix code blocks
- Fix more last bullets in lists
- Fix box newlines
- Fix last bullet in a list
- Fix BoxType
- Fix notes
- Fix literals
- Add the no editing warning at the top when getting snapshots from docx
- Make the snapshot of the frontmatter nicer
- Updates to appendixes C, D, and E after copyedit checks
- Snapshots after copyedit checks of appendices a and b + recheck of 20
- Snapshot of appendices from copyedit
- Updated snapshot of the appendices
- Re-checks of chapter 19
- Re-checks of chapter 18
- Messy snapshot of chapter 20 after copyedit checks
- Snapshot of ch20 after copyedit
- Updated snapshot of chapter 20
- Messy snapshot of chapter 19 after copyedit checks
- Snapshot of ch19 after copyedit
- Updated snapshot of ch19
- Messy snapshot of ch 18 after copyedit review
- Snapshot of ch 18 after copyedit
- Update snapshot of ch18
- Messy snapshot of ch 17 after copyedit review
- Snapshot of ch17 copyedit
- Updated snapshot of ch17
- Messy snapshot of ch16 after copyedit
- Snapshot of ch16 copyedited
- Updated snapshot of ch16
- Messy snapshot of ch 15 after copyedit checks
- Re-review of earlier chapters
- Snapshot of ch15 copyedit
- Update snapshot of ch15
- Messy snapshots of other chapters with indentation fixed
- Messy snapshot of ch2 with indentation fixed
- Add unittests to the allowed words
- Messy snapshot of chapter 14 after checking copyedit
- Snapshot of chapter 14 after copyedit
- Update snapshot of ch14
- Regenerate manual output for chapter 14
- Messy snapshot of chapter 13 after copyedit check
- Updated snapshot of ch13 after copyedit
- Updated snapshot of ch13
- Messy snapshot of chapter 12 after copyedit checks
- Snapshot of chapter 12 copyedited
- Update snapshot for chapter 12
- Messy snapshot of chapter 11 after copyedit check
- Snapshot of chapter 11 copyedited
- Updated snapshot of chapter 11
- Messy snapshot of chapter 10 after copyedit check
- Snapshot of chapter 10 copyedit
- Updated snapshot of chapter 10
- Messy snapshot of ch9 after copyedit checks
- Snapshot of ch 9 copyedit
- Update snapshot of chapter 9
- Messy snapshot of chapter 8
- Update println style in ch8
- Snapshot of chapter 8 from copyedit
- Updated snapshot of chapter 8
- Rearrange my notes yet again
- Messy snapshot of ch7 after copyedit checks
- Snapshot of chapter 7 from copyedit, fix chapter 6 name
- Update snapshot of chapter 7
- Messy snapshot of chapter 6 after copyedit check
- Update snapshot of chapter 6
- Change my notes again
- Messy snapshot of chapter 5 after checking copyedit
- Snapshot of chapter 5 from copyedit
- Messy snapshot of chapter 4 after copyedit check
- Changing my notes again
- Snapshot of ch4 from nostarch
- Messy snapshot of chapter 3 after copyedit check, ch4 on start check
- Snapshot of ch3 from nostarch
- Updated snapshot of ch3
- reorder notes
- Messy snapshot of chapter 1 after copyedit check
- Snapshot of ch01 docx from nostarch
- Updated snapshot of chapter 1
- Messy snapshot of frontmatter docx
- Another snapshot to fix the crab pinchers description
- Messy snapshot of chapter 2 docx
- Get the latest snapshot of chapter 2
- Upgrade to rand 0.8.5
- Notes to self
- Update xsl and take snapshots from docx, such as they are
- Update instructions on docx -&gt; md now that I've done it again
- Propagate frontmatter edits to src
- Updated snapshots extracted from frontmatter
- Support different styles in the docx
- Line wrap bio
- Frontmatter from word doc
- Edits to docx files for nostarch
- docx files from nostarch

## rust-by-example

6 commits in 5e7b296d6c345addbd748f242aae28c42555c015..03491f33375c5a2a1661c7fa4be671fe95ce1249
2022-10-05 08:24:45 -0300 to 2022-10-21 07:30:08 -0300
- fix rust-lang/rust-by-example#1628: the box pointer is on stack not on heap (rust-lang/rust-by-example#1629)
- fix rust-lang/rust-by-example#1608: out-of-bound indexing is a runtime error (not a compile-time error) (rust-lang/rust-by-example#1626
)
- Fix: Path internal representation and conversions (rust-lang/rust-by-example#1625)
- fix crate name in example (rust-lang/rust-by-example#1620)
- avoid reserved keyword try as crate name (rust-lang/rust-by-example#1619)
- Fix typo in iter_result.md (rust-lang/rust-by-example#1614)

## rustc-dev-guide

7 commits in 7518c3445dc02df0d196f5f84e568d633c5141fb..51a37ad19a15709d0601afbac6581f5aea6a45da
2022-10-08 12:29:47 +0200 to 2022-10-25 10:18:58 -0700
- Update `traits/resolution.md` (rust-lang/rustc-dev-guide#1494)
- Update diagnostics to flat fluent message paths
- Update rust-analyzer suggestions (rust-lang/rustc-dev-guide#1487)
- miri is no longer a submodule but a subtree. (rust-lang/rustc-dev-guide#1488)
- fix some links (rust-lang/rustc-dev-guide#1490)
- typo and grammar (rust-lang/rustc-dev-guide#1484)
- Add missing prerequisite for some Linux distros (rust-lang/rustc-dev-guide#1481)
llvm-16: Don't initialize removed legacy passes

LLVM removed initialization for legacy passes:
https://reviews.llvm.org/D136615
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 25, 2022
@compiler-errors
Copy link
Member Author

@bors rollup=never p=7

@JohnTitor
Copy link
Member

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Oct 26, 2022

📌 Commit 1114be0 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Oct 26, 2022
@compiler-errors
Copy link
Member Author

Of course I forgot the most important part. Thanks @JohnTitor.

@bors
Copy link
Contributor

bors commented Oct 26, 2022

🔒 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-objjnyh (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-objjnyh --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
CONFLICT (modify/delete): src/test/ui/privacy/access_levels.stderr deleted in heads/homu-tmp and modified in HEAD. Version HEAD of src/test/ui/privacy/access_levels.stderr left in tree.
CONFLICT (modify/delete): src/test/ui/privacy/access_levels.rs deleted in heads/homu-tmp and modified in HEAD. Version HEAD of src/test/ui/privacy/access_levels.rs left in tree.
Removing src/test/ui/parser/tag-variant-disr-non-nullary.stderr
Removing src/test/ui/parser/tag-variant-disr-non-nullary.rs
Removing src/test/ui/parser/issues/issue-17383.stderr
Removing src/test/ui/parser/issues/issue-17383.rs
Removing src/test/ui/enum-discriminant/feature-gate-arbitrary_enum_discriminant.stderr
Removing src/test/ui/enum-discriminant/feature-gate-arbitrary_enum_discriminant.rs
Removing src/doc/unstable-book/src/language-features/arbitrary-enum-discriminant.md
Auto-merging compiler/rustc_resolve/src/effective_visibilities.rs
CONFLICT (content): Merge conflict in compiler/rustc_resolve/src/effective_visibilities.rs
Auto-merging compiler/rustc_privacy/src/lib.rs
CONFLICT (content): Merge conflict in compiler/rustc_privacy/src/lib.rs
Auto-merging compiler/rustc_middle/src/middle/privacy.rs
CONFLICT (content): Merge conflict in compiler/rustc_middle/src/middle/privacy.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 Oct 26, 2022
@Dylan-DPC Dylan-DPC closed this Oct 26, 2022
@bors
Copy link
Contributor

bors commented Oct 26, 2022

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

@compiler-errors compiler-errors deleted the rollup-objjnyh branch October 26, 2022 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.