Skip to content

add shims for WithOptConstParam query calls - #77550

Merged
bors merged 2 commits into
rust-lang:masterfrom
lcnr:ty-dep-path-ct-cleanup
Oct 12, 2020
Merged

add shims for WithOptConstParam query calls#77550
bors merged 2 commits into
rust-lang:masterfrom
lcnr:ty-dep-path-ct-cleanup

Conversation

@lcnr

@lcnrlcnr commented Oct 4, 2020

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2020
@lcnrlcnr changed the title cleanup WithOptConstParam queriesadd shims for WithOptConstParam query callsOct 4, 2020

@ecstatic-morseecstatic-morse left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my question about suffixes is resolved

In my perfect world, we would encode the unknown variant of WithOptConstArg as a type-state, so you would go from UnknownConstArg(DefId) to KnownConstArg(DefId, Option<DefId>) at some point (maybe with a name change as well). I don't know how ergonomic this would be, however. Adding an Unknown variant to WithOptConstArg might be a good middle ground as eddyb mentioned on Zulip.

}

#[inline]
pub fn optimized_mir_of_opt_const_arg(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these are suffixed with of_opt_const_arg while some have opt_const_arg. Does this denote different semantics? If not, can we use the same suffix for everything?

@lcnrlcnrOct 5, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed of for all of them

@lcnr

lcnr commented Oct 12, 2020

Copy link
Copy Markdown
ContributorAuthor

I guess

@bors r=ecstatic-morse

@bors

bors commented Oct 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 8160bfa has been approved by ecstatic-morse

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 12, 2020
@lcnr

lcnr commented Oct 12, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors rollup

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 12, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 12, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 12, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 12, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 12, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2020
Rollup of 10 pull requests
Successful merges:
- rust-lang#77550 (add shims for WithOptConstParam query calls)
- rust-lang#77699 (Add word wrap for short descriptions)
- rust-lang#77724 (Implement `AsRawFd` for `StdinLock` etc. on WASI.)
- rust-lang#77746 (Fix `x.py setup` sets `changelog-seen`)
- rust-lang#77784 (Fix intra-docs link in core::ffi::VaList)
- rust-lang#77811 (rustdoc: Make some functions private that don't need to be public)
- rust-lang#77818 (Mono collector: replace pair of ints with Range)
- rust-lang#77831 (Use std methods on char instead of open coding them)
- rust-lang#77852 (update url in bootstrap README (gcc-rs -> cc-rs))
- rust-lang#77863 (Remove `mark-i-m` from rustc-dev-guide maintainers)
Failed merges:
r? `@ghost`
@bors
bors merged commit 687d764 into rust-lang:masterOct 12, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 12, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-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.

5 participants

@lcnr@bors@ecstatic-morse@rust-highfive@rustbot