Skip to content

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

lcnr and others added 23 commits October 4, 2020 23:22
WASI implements `AsRawFd` for `Stdin`, `Stdout`, and `Stderr`, so
implement it for `StdinLock`, `StdoutLock`, and `StderrLock` as well.
More print statementsstatements lol

Solved the basic case of eliminating check_version ifk_version if subcommand = setup

Finished v1

checking out old bootstrap.py

checked out old irrelevant files

fixed tidy

Moved VERSION from bin/main.rs to lib.rs

Fixed semicolon return issue

x.py fmt
…atic-morse

add shims for WithOptConstParam query calls

r? @ecstatic-morse @eddyb
…excrichton

Implement `AsRawFd` for `StdinLock` etc. on WASI.

WASI implements `AsRawFd` for `Stdin`, `Stdout`, and `Stderr`, so
implement it for `StdinLock`, `StdoutLock`, and `StderrLock` as well.

r? @alexcrichton
Fix `x.py setup` sets `changelog-seen`

Fixes rust-lang#77572 by setting changelog-seen in setup.rs
…a-docs, r=jyn514

Fix intra-docs link in core::ffi::VaList

At some point, `VaList` was changes to be a [wrapper](https://github.com/rust-lang/rust/blob/1661f77/library/core/src/ffi.rs#L177-L201) over `VaListImpl`, and now the `Arg` method exists on [`VaListImpl`](https://github.com/rust-lang/rust/blob/1661f77/library/core/src/ffi.rs#L333-L336). This PR fixes the intradoc links so that when `--document-private-items` is ran on std (via [patch](https://gist.github.com/aDotInTheVoid/42c82306210203f9c9093c952b765ab4)), it works
rustdoc: Make some functions private that don't need to be public

r? @GuillaumeGomez
Mono collector: replace pair of ints with Range

I found the initial PR (rust-lang#33171) that introduced this piece of code but I didn't find any information about why a tuple was preferred over a `Range<usize>`.

I'm hoping there are no technical reasons to not do this.
Use std methods on char instead of open coding them
…-schievink

update url in bootstrap README (gcc-rs -> cc-rs)

gcc-rs is renamed to cc-rs 3 years ago.
…albini

Remove `mark-i-m` from rustc-dev-guide maintainers

They aren't a maintainer anymore and it causes failure on our CI now: https://github.com/rust-lang-ci/rust/runs/1243600577
@JohnTitor
Copy link
Member Author

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

@bors
Copy link
Collaborator

bors commented Oct 12, 2020

📌 Commit 984f78b has been approved by JohnTitor

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

bors commented Oct 12, 2020

⌛ Testing commit 984f78b with merge 1678854...

@bors
Copy link
Collaborator

bors commented Oct 12, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2020
@bors bors merged commit 1678854 into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
@JohnTitor JohnTitor deleted the rollup-0odg1n4 branch October 12, 2020 21:14
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.