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 5 pull requests #76159

Merged
merged 14 commits into from
Aug 31, 2020
Merged

Rollup of 5 pull requests #76159

merged 14 commits into from
Aug 31, 2020

Conversation

matklad
Copy link
Member

@matklad matklad commented Aug 31, 2020

Successful merges:

Failed merges:

r? @ghost

Amjad50 and others added 14 commits August 26, 2020 18:50
StringReader is an intornal abstraction which at the moment changes a
lot, so these unit tests cause quite a bit of friction.

Moving them to rustc_lexer and more ingerated-testing style should
make them much less annoying, hopefully without decreasing their
usefulness much.

Note that coloncolon tests are removed (it's unclear what those are
testing).

\r\n tests are removed as well, as we normalize line endings even
before lexing.
…visions, r=lcnr

Added some `min_const_generics` revisions into `const_generics` tests

Help in rust-lang#75279. still a lot more to cover though

r? @lcnr
… r=matklad

datastructures: replace `once_cell` crate with an impl from std

Fixes rust-lang#75700

r? @matklad

We might need a perf run for this change.
…y, r=matklad

Restore public visibility on some parsing functions for rustfmt

In rust-lang#74826 the visibility of several parsing functions was reduced. However, rustfmt is an external consumer of some of these functions as well and needs the visibility to be public, similar to other elements in rustc_parse such as `parse_ident`

https://github.com/rust-lang/rust/blob/db534b3ac286cf45688c3bbae6aa6e77439e52d2/src/librustc_parse/parser/mod.rs#L433-L436
rustbuild: Remove one LLD workaround

The version of LLD shipped with Rust no longer have this issue.

Closes rust-lang#68647
@matklad
Copy link
Member Author

matklad commented Aug 31, 2020

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

@rustbot rustbot added the rollup A PR which is a rollup label Aug 31, 2020
@bors
Copy link
Contributor

bors commented Aug 31, 2020

📌 Commit 9caf08f has been approved by matklad

@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 Aug 31, 2020
@bors
Copy link
Contributor

bors commented Aug 31, 2020

⌛ Testing commit 9caf08f with merge 1fd8636...

@bors
Copy link
Contributor

bors commented Aug 31, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: matklad
Pushing 1fd8636 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2020
@bors bors merged commit 1fd8636 into rust-lang:master Aug 31, 2020
@matklad matklad deleted the rollup-8jydjg3 branch August 31, 2020 15:30
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
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. rollup A PR which is a rollup 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.

8 participants