Skip to content

Rollup of 12 pull requests #74019

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 43 commits into from
Jul 4, 2020
Merged

Rollup of 12 pull requests #74019

merged 43 commits into from
Jul 4, 2020

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

tmiasko and others added 30 commits June 8, 2020 20:35
The xml.etree.cElementTree has been deprecated since Python 3.3
and removed in Python 3.9 https://bugs.python.org/issue36543.
Apply suggestion from varkor

Co-authored-by: varkor <github@varkor.com>
Co-Authored-By: Ralf Jung <post@ralfj.de>
If temporaries are used beyond just the temporary chain, then we can't
optimize out the reads and writes.
The previous link is 404.
- Add newline to provide concise module summary
- Add wikipedia link
- Italicize O notation
GuillaumeGomez and others added 13 commits July 4, 2020 00:15
Fallback to xml.etree.ElementTree

The xml.etree.cElementTree has been deprecated since Python 3.3
and removed in Python 3.9 https://bugs.python.org/issue36543.
…varkor

Add `format_args_capture` feature

This is the initial implementation PR for [RFC 2795](rust-lang/rfcs#2795).

Note that, as dicussed in the tracking issue (rust-lang#67984), the feature gate has been called `format_args_capture`.

Next up I guess I need to add documentation for this feature. I've not written any docs before for rustc / std so I would appreciate suggestions on where I should add docs.
…atch, r=oli-obk

Use exhaustive match in const_prop.rs

Addresses a comment left by @RalfJung on rust-lang#73613

r? @RalfJung
Use &raw in A|Rc::as_ptr

This PR uses `&raw` for offsetting `*mut [A]RcInner<T> -> *mut T`.

Additionally, this updates the implementation of `Weak::as_ptr` to support unsized `T`, though it does not yet relax the bounds of `Weak::as_ptr`/`into_raw`/`from_raw` to accept unsized `T`.
…s-schievink

Standardize bibliographic citations in rustc API docs

See rust-lang#73877.
… r=RalfJung

Improve comments from rust-lang#72617, as suggested by RalfJung

r? @RalfJung
…li-obk

[mir-opt] Fix mis-optimization and other issues with the SimplifyArmIdentity pass

This does not yet attempt re-enabling the pass, but it does resolve a number of issues with the pass.

r? @oli-obk

I believe this closes rust-lang#73223.
…chievink

Edit docs for rustc_data_structures::graph::scc

- Add newline to provide concise module summary
- Add wikipedia link
- Italicize O notation
…nas-schievink

Fix "getting started" link

The previous link is 404.
Bump mingw-check CI image from Ubuntu 16.04 to 18.04.

I chose 18.04 because we use it for other builders, and it's enough to get a version of MinGW that can build `libssh2-sys`.

This is a prereq for rust-lang#73902, where `libssh2-sys` shows up as an indirect dependency of `x.py check src/tools/semverver` (through `src/tools/cargo`, which we don't currently `x.py check` because it's not in-tree). See also rust-lang#73902 (comment).

r? @Mark-Simulacrum cc @mati865
@Manishearth
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jul 4, 2020

📌 Commit d69a846 has been approved by Manishearth

@rustbot rustbot added the rollup A PR which is a rollup label Jul 4, 2020
@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 Jul 4, 2020
@bors
Copy link
Collaborator

bors commented Jul 4, 2020

⌛ Testing commit d69a846 with merge dbf3ae7...

@bors
Copy link
Collaborator

bors commented Jul 4, 2020

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

@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 Jul 4, 2020
@Manishearth
Copy link
Member Author

lol

@Manishearth
Copy link
Member Author

Screenshot_20200703-185518.png

That's an interesting state we're in @pietroalbini

I assume it merged with git's algorithm but not github's

@bors
Copy link
Collaborator

bors commented Jul 4, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Manishearth
Pushing dbf3ae7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 4, 2020
@bors bors merged commit dbf3ae7 into rust-lang:master Jul 4, 2020
@Manishearth Manishearth deleted the rollup-2st3jsk branch July 18, 2020 01:14
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.