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 6 pull requests #80905

Merged
merged 13 commits into from
Jan 11, 2021
Merged

Rollup of 6 pull requests #80905

merged 13 commits into from
Jan 11, 2021

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

eltociear and others added 13 commits January 10, 2021 22:17
Add ABI argument for called function in `find_mir_or_eval_fn` and
`call_extra_fn`. Useful for comparing with expected ABI in interpreters.

Related to [miri/1631](rust-lang/miri#1631)
Nearly all error messages start with a lowercase letter and don't use
articles - instead they refer to the plural case.
Logging goes to stderr, not stdout, so we should base our automated
detection on stderr instead of stdout.

Thanks to Ralf Jung for noticing and reporting the bug!
It's not valid Rust code and it can easily be confused with a wildcard
glob pattern or something else. People can always use `pointer` instead,
so it's just removing an alias.

It hasn't hit stable yet (I think it's still on nightly), so it's okay
to remove it. (We can always add it back later if we change our mind
too.)
Use standard formatting for "rust-call" ABI message

Nearly all error messages start with a lowercase letter and don't use
articles - instead they refer to the plural case.
Fix typo in source-based-code-coverage.md

preceeding -> preceding
Add ABI argument to `find_mir_or_eval_fn`

Add ABI argument for called function in `find_mir_or_eval_fn` and
`call_extra_fn`. Useful for comparing with expected ABI in interpreters.

Related to [miri/1631](rust-lang/miri#1631)

r? `@RalfJung`
…omez

 Fix intra-doc links to `Self` and `crate`

Closes rust-lang#77732.
log-color: Detect TTY based on stderr, not stdout

Fixes rust-lang#78435 (again).

Logging goes to stderr, not stdout, so we should base our automated
detection on stderr instead of stdout.

Thanks to Ralf Jung for noticing and reporting the bug!

r? `@oli-obk`
cc `@RalfJung`
…n514

rustdoc: Remove `*` intra-doc alias for `pointer`

It's not valid Rust code and it can easily be confused with a wildcard
glob pattern or something else. People can always use `pointer` instead,
so it's just removing an alias.

It hasn't hit stable yet (I think it's still on nightly), so it's okay
to remove it. (We can always add it back later if we change our mind
too.)

r? `@jyn514`
cc rust-lang#80885 (comment)
@rustbot rustbot added the rollup A PR which is a rollup label Jan 11, 2021
@JohnTitor
Copy link
Member Author

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Jan 11, 2021

📌 Commit a7f7d70 has been approved by JohnTitor

@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 Jan 11, 2021
@bors
Copy link
Contributor

bors commented Jan 11, 2021

⌛ Testing commit a7f7d70 with merge a2cd91c...

@bors
Copy link
Contributor

bors commented Jan 11, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 11, 2021
@bors bors merged commit a2cd91c into rust-lang:master Jan 11, 2021
@rustbot rustbot added this to the 1.51.0 milestone Jan 11, 2021
@JohnTitor JohnTitor deleted the rollup-tmmwmnb branch January 11, 2021 09:02
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #80905!

Tested on commit a2cd91c.
Direct link to PR: #80905

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jan 11, 2021
Tested on commit rust-lang/rust@a2cd91c.
Direct link to PR: <rust-lang/rust#80905>

💔 miri on windows: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
💔 miri on linux: test-pass → build-fail (cc @oli-obk @eddyb @RalfJung).
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.

7 participants