Skip to content

Rollup of 8 pull requests - #91033

Merged
bors merged 19 commits into
rust-lang:masterfrom
JohnTitor:rollup-sr9zg6o
Nov 19, 2021
Merged

Rollup of 8 pull requests#91033
bors merged 19 commits into
rust-lang:masterfrom
JohnTitor:rollup-sr9zg6o

Conversation

@JohnTitor

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

est31and others added 19 commits October 16, 2021 01:20
`Candidate` enum has only a single `Ref` variant. Refactor it into a
struct and reduce overall indentation of the code by two levels.
No functional changes.
In some situations we should want on influence into the .cargo/config
when we use vendored source. One example is rust-lang#90764, when we want to
workaround some references to crates forked and living in git, that are
missing in the vendor/ directory.
This commit will create the .cargo/config file only when the .cargo/
directory needs to be created.
Because it's always `'tcx`. In fact, some of them use a mixture of
passed-in `$tcx` and hard-coded `'tcx`, so no other lifetime would even
work.
This makes the code easier to read.
Also use `Default::default()` in one `TypedArena::default()`, for
consistency with `DroplessArena::default()`.
Make char conversion functions unstably const
The char conversion functions like `char::from_u32` do trivial computations and can easily be converted into const fns. Only smaller tricks are needed to avoid non-const standard library functions like `Result::ok` or `bool::then_some`.
Tracking issue: rust-lang#89259
add const generics test
cc rust-lang#89829 (comment)
r? rust-lang/project-const-generics
Refactor single variant `Candidate` enum into a struct
`Candidate` enum has only a single `Ref` variant. Refactor it into a
struct and reduce overall indentation of the code by two levels.
No functional changes.
…mulacrum
bootstap: create .cargo/config only if not present
In some situations we should want on influence into the .cargo/config
when we use vendored source. One example is rust-lang#90764, when we want to
workaround some references to crates forked and living in git, that are
missing in the vendor/ directory.
This commit will create the .cargo/config file only when the .cargo/
directory needs to be created.
windows: Return the "Not Found" error when a path is empty
Fixesrust-lang#90940
Move some tests to more reasonable directories - 9.5
cc rust-lang#73494
r? `@petrochenkov`
…=nagisa
Suggest removal of arguments for unit variant, not replacement
Arenas cleanup
I was looking closely at the arenas code and here are some small improvement to readability.
@rustbotrustbot added the rollup A PR which is a rollup label Nov 19, 2021
@JohnTitor

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=8 rollup=never

@bors

bors commented Nov 19, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 1576a7c has been approved by JohnTitor

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 19, 2021
@bors

bors commented Nov 19, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 1576a7c with merge e8423e6...

@bors

bors commented Nov 19, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing e8423e6 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 19, 2021
@bors
bors merged commit e8423e6 into rust-lang:masterNov 19, 2021
@rustbotrustbot added this to the 1.58.0 milestone Nov 19, 2021
@JohnTitor
JohnTitor deleted the rollup-sr9zg6o branch November 19, 2021 09:34
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (e8423e6): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

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.

11 participants

@JohnTitor@bors@rust-timer@rustbot@est31@tmiasko@aplanas@estebank@nnethercote@lcnr@c410-f3r