Skip to content

Rollup of 5 pull requests - #76159

Merged
bors merged 14 commits into
rust-lang:masterfrom
matklad:rollup-8jydjg3
Aug 31, 2020
Merged

Rollup of 5 pull requests#76159
bors merged 14 commits into
rust-lang:masterfrom
matklad:rollup-8jydjg3

Conversation

@matklad

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Amjad50and 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
Fixesrust-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.
Closesrust-lang#68647
@matklad

Copy link
Copy Markdown
ContributorAuthor

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

@rustbotrustbot added the rollup A PR which is a rollup label Aug 31, 2020
@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9caf08f has been approved by matklad

@borsbors 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

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors mentioned this pull request Aug 31, 2020
@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2020
@bors
bors merged commit 1fd8636 into rust-lang:masterAug 31, 2020
@matklad
matklad deleted the rollup-8jydjg3 branch August 31, 2020 15:30
@cuvipercuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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

@matklad@bors@cuviper@rustbot@Amjad50@calebcartwright@marmeladema@petrochenkov