Skip to content

Warn on unused patches. - #6470

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:warn-unused-patch
Dec 22, 2018
Merged

Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom
ehuss:warn-unused-patch

Conversation

@ehuss

@ehussehuss commented Dec 21, 2018

Copy link
Copy Markdown
Contributor

Adds a warning when a [patch] entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.

Fixes#6444

@rust-highfive

rust-highfive commented Dec 21, 2018

Copy link
Copy Markdown

r? @Eh2406

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

@ehuss

ehuss commented Dec 21, 2018

Copy link
Copy Markdown
ContributorAuthor

My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.

@Eh2406

Eh2406 commented Dec 21, 2018

Copy link
Copy Markdown
Contributor

Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.

alexcrichton
alexcrichton reviewed Dec 21, 2018
View reviewed changes

@alexcrichtonalexcrichton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!

Comment threadsrc/cargo/ops/resolve.rs Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/

(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)

@Eh2406

Eh2406 commented Dec 22, 2018

Copy link
Copy Markdown
Contributor

@bors r=alexcrichton

@bors

bors commented Dec 22, 2018

Copy link
Copy Markdown
Contributor

📌 Commit e35ecbe has been approved by alexcrichton

@bors

bors commented Dec 22, 2018

Copy link
Copy Markdown
Contributor

⌛ Testing commit e35ecbe with merge 8e547a7...

bors added a commit that referenced this pull request Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors

bors commented Dec 22, 2018

Copy link
Copy Markdown
Contributor

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 8e547a7 to master...

@bors
bors merged commit e35ecbe into rust-lang:masterDec 22, 2018
@ehussehuss mentioned this pull request Dec 28, 2018
Merged
bors added a commit that referenced this pull request Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss mentioned this pull request Jan 3, 2019
Merged
bors added a commit to rust-lang/rust that referenced this pull request Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss mentioned this pull request May 16, 2020
Merged
bors added a commit that referenced this pull request May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss added this to the 1.33.0 milestone Feb 6, 2022
@weihangloweihanglo mentioned this pull request May 24, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels

None yet

Projects

None yet

Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.

5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton
, '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" + '
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton

, '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('^' + ".*" + '
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton

, '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('^' + ".*" + '
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton

, '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" + '
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton

, '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('^' + ".*" + '
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton

, '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('^' + ".*" + '
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton

, '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); }
})();
})();
Warn on unused patches. by ehuss · Pull Request #6470 · rust-lang/cargo · GitHub
Skip to content
Warn on unused patches. - #6470
Merged
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Dec 22, 2018
Merged
Warn on unused patches.#6470
bors merged 1 commit into
rust-lang:masterfrom 
ehuss:warn-unused-patch
Conversation
@ehuss
@ehussehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Adds a warning when a [patch] entry fails to match anything.

I've hit this several times in the past, and it always takes me

5 minutes of confusion to figure out what's wrong.
Fixes#6444
@rust-highfive
rust-highfive
commented
Dec 21, 2018

Copy link


Copy Markdown

r? @Eh2406
(rust_highfive has picked a reviewer for you, use r? to override)
@ehuss
ehuss
commented
Dec 21, 2018

Copy link


Copy Markdown

ContributorAuthor
My confidence is low that this is correct, or that the new message is clear enough. My original impression was that patches are typically temporary, and you'd always want to know if it's not working. However, sometimes people do clever things that I don't expect.
@Eh2406
Eh2406
commented
Dec 21, 2018

Copy link


Copy Markdown

Contributor
Thanks for working on this! This looks like a good step in the correct direction. I don't know much about how the ops part of the code fits together so, I would like to defer to @alexcrichton.
alexcrichton
alexcrichton
reviewed
Dec 21, 2018
View reviewed changes
@alexcrichtonalexcrichton
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Just one minor wording nit, but otherwise looks good to me!
Comment threadsrc/cargo/ops/resolve.rs
Outdated

@alexcrichtonalexcrichtonDec 21, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

I might recommend s/did not match any packages/did not end up being used in the crate graph/
(or something like that, it must match in one way or another but the error here is that it didn't end up actually being use)
@Eh2406
Eh2406
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
@bors r=alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
📌 Commit e35ecbe has been approved by alexcrichton
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
⌛ Testing commit e35ecbe with merge 8e547a7...
bors added a commit
that referenced
this pull request
Dec 22, 2018
@bors
Auto merge of#6470- ehuss:warn-unused-patch, r=alexcrichton
8e547a7
Warn on unused patches.
Adds a warning when a `[patch]` entry fails to match anything.
I've hit this several times in the past, and it always takes me
5 minutes of confusion to figure out what's wrong.
Fixes#6444
@bors
bors
commented
Dec 22, 2018

Copy link


Copy Markdown

Contributor
☀️ Test successful - status-appveyor, status-travis

Approved by: alexcrichton

Pushing 8e547a7 to master...
@bors
bors
merged commit e35ecbe
into
rust-lang:masterDec 22, 2018
@ehussehuss
mentioned this pull request
Dec 28, 2018
 Merged

bors added a commit
that referenced
this pull request
Dec 28, 2018
@bors
Auto merge of#6494- ehuss:fix-unused-patch-warning, r=dwijnand
9bf8592
Fix new unused patch warning.
The unused `[patch]` warning added in #6470 was misfiring if you build only a subset of a workspace that doesn't include the patch.
I'm about 80% confident this new logic is correct. It addresses the scenario I discovered, and I tested a bunch of commands (generate-lockfile, update, etc.) to make sure they all work. However, the many ways that `resolve_with_previous` is called is tricky to ensure every scenario works correctly.
@ehussehuss
mentioned this pull request
Jan 3, 2019
 Merged

bors added a commit
to rust-lang/rust
that referenced
this pull request
Jan 4, 2019
@bors
Auto merge of#57315- ehuss:update-cargo, r=alexcrichton
ae38bae
Update cargo
24 commits in 0d1f1bbeabd5b43a7f3ecfa16540af8e76d5efb4..34320d212dca8cd27d06ce93c16c6151f46fcf2e
2018-12-19 14:45:14 +0000 to 2019-01-03 19:12:38 +0000
- Display environment variables for rustc commands (rust-lang/cargo#6492)
- Fix a very minor race condition in `cargo fix`. (rust-lang/cargo#6515)
- Add a high-level overview of how `fix` works. (rust-lang/cargo#6516)
- Add dependency `registry` to `cargo metadata`. (rust-lang/cargo#6500)
- Fix fingerprint calculation for patched deps. (rust-lang/cargo#6493)
- serialize version directly (rust-lang/cargo#6512)
- use DYLD_FALLBACK_LIBRARY_PATH for dylib_path_envvar on macOS (rust-lang/cargo#6355)
- Fix error message when resolving dependencies (rust-lang/cargo#6510)
- use PathBuf in cargo metadata (rust-lang/cargo#6511)
- Fixed link to testsuite in CONTRIBUTING.md (rust-lang/cargo#6506)
- Update display of contents of Cargo.toml (rust-lang/cargo#6501)
- Update display of contents of Cargo.toml (rust-lang/cargo#6502)
- Fixup cargo install's help message (rust-lang/cargo#6495)
- testsuite: Require failing commands to check output. (rust-lang/cargo#6497)
- Delete unnecessary 'return' (rust-lang/cargo#6496)
- Fix new unused patch warning. (rust-lang/cargo#6494)
- Some minor documentation changes. (rust-lang/cargo#6481)
- Add `links` to `cargo metadata`. (rust-lang/cargo#6480)
- Salvaged semver work (rust-lang/cargo#6476)
- Warn on unused patches. (rust-lang/cargo#6470)
- don't write a an incorrect rustc version to the fingerprint file (rust-lang/cargo#6473)
- Rewrite `login` and registry cleanups. (rust-lang/cargo#6466)
- [issue#6461] Fix cargo commands list (rust-lang/cargo#6462)
- Restrict registry names to same style as package names. (rust-lang/cargo#6469)
@ehussehuss
mentioned this pull request
May 16, 2020
 Merged

bors added a commit
that referenced
this pull request
May 21, 2020
@bors
Auto merge of#8248- ehuss:patch-err-help, r=alexcrichton
d662f25
Provide better error messages for a bad `patch`.
This attempts to provide more user-friendly error messages for some situations with a bad `patch`. This is a follow-up to #8243.
I think this more or less covers all the issues from #4678. I imagine there are other corner cases, but those will need to wait for another day. The main one I can think of is when the patch location is missing required features. Today you get a "blah was not used in the crate graph." warning, with some suggestions added in #6470, but it doesn't actually check if there is a feature mismatch.
Closes#4678
@ehussehuss
added this to the 1.33.0 milestone
Feb 6, 2022
@weihangloweihanglo
mentioned this pull request
May 24, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@alexcrichtonalexcrichtonalexcrichton left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@Eh2406Eh2406

Labels


None yet


Projects


None yet


Milestone

1.33.0

Development

Successfully merging this pull request may close these issues.

Cargo silently ignores patch crates with a missing feature.


5 participants

@ehuss@rust-highfive@Eh2406@bors@alexcrichton