') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Make `InferCtxt::can_eq` and `InferCtxt::can_sub` return booleans by compiler-errors · Pull Request #108010 · rust-lang/rust · GitHub
Skip to content

Make InferCtxt::can_eq and InferCtxt::can_sub return booleans - #108010

Merged
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:can_eq-returns-bool
Feb 16, 2023
Merged

Make InferCtxt::can_eq and InferCtxt::can_sub return booleans#108010
bors merged 1 commit into
rust-lang:masterfrom
compiler-errors:can_eq-returns-bool

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Feb 13, 2023

Copy link
Copy Markdown
Contributor

Nobody matches on the result, nor does the result return anything useful...

@rustbot

rustbot commented Feb 13, 2023

Copy link
Copy Markdown
Collaborator

r? @lcnr

(rustbot has picked a reviewer for you, use r? to override)

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 13, 2023
@compiler-errors

compiler-errors commented Feb 13, 2023•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

After #107940 lands, this these functions should additionally use TyCtxt::check_tys_might_be_eq when the new solver is enabled, to check for deep type equality with lazy norm... but I'll leave that up to another PR.

@BoxyUwU

BoxyUwU commented Feb 13, 2023

Copy link
Copy Markdown
Member

I feel like if !self.infcx.can_eq(a, b) { is less clear than if self.infcx.can_eq(a, b).is_err(). Could we just make the return type Result<(), ()>. if we start handling nested obligations we wont be able to always return a TypeError anyway so getting rid of it would have to happen

@compiler-errors

compiler-errors commented Feb 13, 2023

Copy link
Copy Markdown
ContributorAuthor

The answer to a "can" question being a boolean makes pretty good sense to me, and !self.can_do_thing() is pretty clearly "can't do thing".

We also have FnCtxt::can_coerce which has a handful of !self.can_coerce calls around the codebase already.

@lcnr

lcnr commented Feb 14, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Ignoring for a moment that can_eq is kinda bad as a whole because it ignores nested obligations causing stuff like lazy norm to end up changing behavior I am in favor of this change.

Definitely in favor of yeeting TypeError from can_eq because I can't think of a case where you should use that TypeError to actually do anything 😅

wrt TyCtxt::check_tys_might_be_eq and lazy norm I don't yet have an opinion. I slightly prefer returning bool over result here.

@lcnr

lcnr commented Feb 15, 2023

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 15, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit eb286dd has been approved by lcnr

It is now in the queue for this repository.

@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 Feb 15, 2023
@matthiaskrgrmatthiaskrgr mentioned this pull request Feb 15, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2023
@bors
Auto merge ofrust-lang#108096- matthiaskrgr:rollup-ncexzf6, r=matth…
dc7a676
…iaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#107034 (Migrating rustc_infer to session diagnostics (part 4))
- rust-lang#107972 (Fix unintentional UB in ui tests)
- rust-lang#108010 (Make `InferCtxt::can_eq` and `InferCtxt::can_sub` return booleans)
- rust-lang#108021 (make x look for x.py if shell script does not exist)
- rust-lang#108047 (Use `target` instead of `machine` for mir interpreter integer handling.)
- rust-lang#108049 (Don't suggest `#[doc(hidden)]` trait methods with matching return type)
- rust-lang#108066 (Better names for illegal impl trait positions)
- rust-lang#108076 (rustdoc: Use more let chain)
- rust-lang#108088 (clarify correctness of `black_box`)
- rust-lang#108094 (Demonstrate I/O in File examples)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 8f65e25 into rust-lang:masterFeb 16, 2023
@rustbotrustbot added this to the 1.69.0 milestone Feb 16, 2023
@compiler-errors
compiler-errors deleted the can_eq-returns-bool branch August 11, 2023 19:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@lcnrlcnr

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.69.0

Development

Successfully merging this pull request may close these issues.

5 participants

@compiler-errors@rustbot@BoxyUwU@lcnr@bors