') + ')', '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 diagnostic message clearer when called from cargo by mathroc · Pull Request #25381 · rust-lang/rust · GitHub
Skip to content

make diagnostic message clearer when called from cargo - #25381

Merged
alexcrichton merged 1 commit into
rust-lang:masterfrom
mathroc:patch-1
May 14, 2015
Merged

make diagnostic message clearer when called from cargo#25381
alexcrichton merged 1 commit into
rust-lang:masterfrom
mathroc:patch-1

Conversation

@mathroc

@mathrocmathroc commented May 13, 2015

Copy link
Copy Markdown
Contributor

@rust-highfive

rust-highfive commented May 13, 2015

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @sfackler (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see CONTRIBUTING.md for more information.

@alexcrichton

alexcrichton commented May 13, 2015

Copy link
Copy Markdown
Member

Thanks for the PR! Our error messages conventionally start with lowercase letters instead of uppercase, so could this say "run rustc ..." instead of "Run rustc"? Other than that though this looks good to me!

@mathroc

mathroc commented May 13, 2015

Copy link
Copy Markdown
ContributorAuthor

alright it's done. I didn't squashed it as asked from the @rust-highfive bot. if you like it better squashed as it such a small edit, just tell me :)

@alexcrichton

alexcrichton commented May 13, 2015

Copy link
Copy Markdown
Member

r+ from me with a squash

@mathroc

mathroc commented May 13, 2015

Copy link
Copy Markdown
ContributorAuthor

and it's squashed

@alexcrichton

alexcrichton commented May 13, 2015

Copy link
Copy Markdown
Member

@bors: r+ 5f932e8 rollup

Thanks!

bors added a commit that referenced this pull request May 14, 2015
@bors
Auto merge of#25381- mathroc:patch-1, r=alexcrichton
af52207
closesrust-lang/cargo#1554
@bors

bors commented May 14, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5f932e8 with merge af52207...

Manishearth added a commit to Manishearth/rust that referenced this pull request May 14, 2015
@Manishearth
Rollup merge ofrust-lang#25381- mathroc:patch-1, r=alexcrichton
ab47005
closesrust-lang/cargo#1554
@ManishearthManishearth mentioned this pull request May 14, 2015
Merged
@alexcrichton

alexcrichton commented May 14, 2015

Copy link
Copy Markdown
Member

Looks like one of the bots disappeared and then buildbot got hung up, everything passed, though, on many platforms, so I'm going to merge this manually.

@alexcrichton
alexcrichton merged commit 5f932e8 into rust-lang:masterMay 14, 2015
@mathroc
mathroc deleted the patch-1 branch May 14, 2015 18:02
bors added a commit that referenced this pull request May 14, 2015
@bors
Auto merge of#25403- Manishearth:rollup, r=Manishearth
571f371
- Successful merges: #25354, #25381, #25391, #25395, #25397, #25398, #25401
- Failed merges:
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@sfacklersfackler

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

cargo directly piping rustc output generates confusion with --explain

5 participants

@mathroc@rust-highfive@alexcrichton@bors@sfackler