Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', '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('^' + ".*" + ' Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, '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" + ' Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, '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('^' + ".*" + ' Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, '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); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add --path option to 'rustup override set' by pickfire · Pull Request #1524 · rust-lang/rustup · GitHub
Skip to content

Add --path option to 'rustup override set' - #1524

Merged
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path
Apr 15, 2019
Merged

Add --path option to 'rustup override set'#1524
kinnison merged 2 commits into
rust-lang:masterfrom
pickfire:toolchain-set-path

Conversation

@pickfire

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

@pickfire
pickfireforce-pushed the toolchain-set-path branch 2 times, most recently from 72bb48a to 5f8930eCompareOctober 9, 2018 16:39
@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Are you still interested in persuing this change? If so, you need to rebase it against the current master (We've had a bit of a reformat of code so it's conflicting). Also it'd be nice if you could add a test to cover the new --path functionality.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison I am interested but I thought rustup.rs might not accept the changes since it's kinda not accepting changes last time IIRC.

If the patch could be accepted (I could fix the stuff), I am still interested in this but probably need some time since I've been a bit busy lately.

@kinnison

Copy link
Copy Markdown
Contributor

I think it's fair to say that merges will not be fast into this repo because the maintainers are busy elsewhere a lot of the time, but I at least am interested in sorting improvements out, and @nrc is able to look in and merge stuff if it's clean and clear :-D I guess step one would be to rebase onto current master and organise a test or two. Once that's done, I'm prepared to help get it mergeable if @nrc wants anything else doing first.

@bors

bors commented Jan 8, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1576) made this pull request unmergeable. Please resolve the merge conflicts.

@dwijnand

Copy link
Copy Markdown
Contributor

Same as --path in 'rustup override unset'

If this is fixing feature parity then I'd expect it to be accepted. I agree it would be good for this to come with a test (as well as needing another rebase.. 😕)

@pickfire

pickfire commented Feb 2, 2019

Copy link
Copy Markdown
ContributorAuthor

I have rebased against master but not sure what to test though, the current unset does not have tests for path as well.

@kinnison

Copy link
Copy Markdown
Contributor

Thanks for the rebase, and I'm glad to see the green tick. I'll give some thought to what testing might be appropriate, given you say there's also a gap in the override unset testing too.

@bors

bors commented Mar 15, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1704) made this pull request unmergeable. Please resolve the merge conflicts.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison What do I do now? Resolve the merge conflict again?

@kinnison

Copy link
Copy Markdown
Contributor

I've been unable to give any time to thinking about this particular PR, which is sad. Re-reading it I'd say that we agreed on what was missing (tests) but not on what those tests would look like or who would be responsible for them. If you lack time to speculatively address these issues then please just let the PR sit for now.

It's possible someone else will come along who wants to work on Rustup and has the time to work it through. A rebase ought not to be too painful (though Dale has rearranged the codebase now so it's not going to be entirely trivial), but the tests remain the sticking point.

@dwijnand

This comment has been minimized.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@dwijnand Thanks a lot for helping out.

@kinnison I have no issues rebasing, I am just not sure what tests to write for this.

@kinnison

Copy link
Copy Markdown
Contributor

Regarding tests, the main thing is that we should verify that rustup override {un,}set --path ... works correctly. This probably means creating a test which sets up a directory with an override, and then verifies that it works, and then unsets it and verifies the override is gone.

However, if you're really stuck with how to do that, just hold the rebased branch for now until someone can help you with the tests. Sadly I don't have enough time right now to provide an example.

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #1754) made this pull request unmergeable. Please resolve the merge conflicts.

Same as --path in 'rustup override unset'
@pickfire

Copy link
Copy Markdown
ContributorAuthor

I added test for both set and unset only for --path.

@kinnison

Copy link
Copy Markdown
Contributor

Hi @pickfire

Thanks for updating the branch, but the Windows test (Appveyor) failed. From a glance it looks like you maybe hard-coded an architecture name in your test? I will try and review the code later to help you out if you can't spot the bug.

D.

@pickfire

Copy link
Copy Markdown
ContributorAuthor

@kinnison Could you please help me to check what to change? I am not so rich to buy a windows laptop, I don't have one to test it out (as well I am not very familiar with windows).

@kinnisonkinnison 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.

Other than the test issue, this LGTM.

Comment threadtests/cli-rustup.rs Outdated
@kinnison
kinnison merged commit 5d1db84 into rust-lang:masterApr 15, 2019
@pickfire
pickfire deleted the toolchain-set-path branch April 16, 2019 16:06
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@pickfire@kinnison@bors@dwijnand