Perhaps you meant: foo, bar or foobar #6550

In-line · 2019-01-14T19:35:24Z

Hi! Rust project is very cool, but I noticed some minor issues. In every place did you mean: bla bla end with the question mark, so I decided to include it here too.

rust-highfive · 2019-01-14T19:35:28Z

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

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

Please see the contribution instructions for more information.

alexcrichton · 2019-01-14T20:36:30Z

tests/testsuite/directory.rs

@@ -189,7 +189,7 @@ error: failed to compile `bar v0.1.0`, intermediate artifacts can be found at `[
 Caused by:
  no matching package named `baz` found
 location searched: registry `https://github.com/rust-lang/crates.io-index`
-did you mean: bar, foo
+did you mean: bar, foo?


I wonder if the ? would look better here before the colon? I'm a little worried about it accidentally looking like it's part of the crate name

I was thinking the same.

did you mean: bar, foo ?

did you mean? bar, foo

Perhaps you mean: bar, foo

Maybe variant without any questions is the best?

sounds good to me! although it may want to be worded "perhaps you meant: foo, bar"

Yeah, perhaps you meant: foo, bar looks good.

Alternatively we can quote them: did you mean: "bar", "foo"?.

And, to be honest, I think we could also throw an "or" in there, so with 3 cases it would look like:

perhaps you meant: bar, foo, or baz, or

did you mean: "bar", "foo", or "baz"?

(Oxford comma usage optional! 😉)

But I'd be happy to accept either of the first two.

I like the idea of "or", although I'd prefer to avoid using quotes as it makes it easier to copy/paste without them sometimes

@alexcrichton @dwijnand What is your decision mighty Dictators?

Go with perhaps you meant: bar, foo, baz.
If you're feeling ambitious: perhaps you meant: bar, foo, or baz 😄

In-line · 2019-01-14T22:05:14Z

I splitted this PR to two, so typo fix can be merged sooner :)
#6552

In-line · 2019-01-19T13:30:21Z

src/cargo/core/resolver/errors.rs

+                |acc, (i, el)| match i {
+                    0 => acc + el,
+                    i if names.len() - 1 == i && candidates.len() <= 3 => acc + " or " + el,
+                    _ => acc + ", " + el,


Is this code idiomatic way to achieve what we want?

Not sure, but it looks like how I'd do it :)

dwijnand · 2019-01-20T07:34:20Z

Excellent, thank you!

@bors: r+

bors · 2019-01-20T07:34:21Z

📌 Commit 67dbfe5 has been approved by dwijnand

bors · 2019-01-20T07:34:28Z

⌛ Testing commit 67dbfe5 with merge 6d5cd59...

…nand Perhaps you meant: foo, bar or foobar Hi! Rust project is very cool, but I noticed some minor issues. In every place `did you mean: bla bla` end with the question mark, so I decided to include it here too.

bors · 2019-01-20T08:01:18Z

☀️ Test successful - checks-travis, status-appveyor
Approved by: dwijnand
Pushing 6d5cd59 to master...

@Mark-Simulacrum

Update cargo Pull in fix for #57774. 6 commits in ffe65875fd05018599ad07e7389e99050c7915be..907c0febe7045fa02dff2a35c5e36d3bd59ea50d 2019-01-17 23:57:50 +0000 to 2019-01-20 22:31:07 +0000 - Put mtime-on-use behind a feature flag. (rust-lang/cargo#6573) - Fix a typo in the unstable docs (rust-lang/cargo#6569) - Perhaps you meant: foo, bar or foobar (rust-lang/cargo#6550) - Refactor: Create uninstall submodule (rust-lang/cargo#6557) - Fix spurious Windows errors with switch_features_rerun. (rust-lang/cargo#6561) - Stop building on master on Travis. (rust-lang/cargo#6562) r? @Mark-Simulacrum

rust-highfive assigned dwijnand Jan 14, 2019

In-line force-pushed the did-you-mean-with-question-mark branch from 7d5e006 to 2142b41 Compare January 14, 2019 19:37

In-line changed the title ~~Fix typo and add qeuestion mark in the necessary places~~ Fix typo and add question mark in the necessary places Jan 14, 2019

alexcrichton reviewed Jan 14, 2019

View reviewed changes

In-line force-pushed the did-you-mean-with-question-mark branch from 2142b41 to a8a9169 Compare January 14, 2019 22:02

In-line changed the title ~~Fix typo and add question mark in the necessary places~~ Add question mark in the necessary places Jan 14, 2019

In-line force-pushed the did-you-mean-with-question-mark branch from a8a9169 to 74176ec Compare January 19, 2019 13:28

In-line changed the title ~~Add question mark in the necessary places~~ Perhaps you meant: foo, bar or foobar Jan 19, 2019

In-line commented Jan 19, 2019

View reviewed changes

Perhaps you meant: bar, foo or foobar

67dbfe5

In-line force-pushed the did-you-mean-with-question-mark branch from 74176ec to 67dbfe5 Compare January 19, 2019 13:34

In-line changed the title ~~Perhaps you meant: foo, bar or foobar~~ Perhaps you meant: foo, bar or foobar Jan 19, 2019

bors merged commit 67dbfe5 into rust-lang:master Jan 20, 2019

ehuss mentioned this pull request Jan 20, 2019

Update cargo rust-lang/rust#57789

Merged

In-line deleted the did-you-mean-with-question-mark branch January 23, 2019 12:26

ehuss added this to the 1.34.0 milestone Feb 6, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Perhaps you meant: foo, bar or foobar #6550

Perhaps you meant: foo, bar or foobar #6550

In-line commented Jan 14, 2019 •

edited

Loading

rust-highfive commented Jan 14, 2019

alexcrichton Jan 14, 2019

In-line Jan 14, 2019 •

edited

Loading

alexcrichton Jan 15, 2019

dwijnand Jan 15, 2019

alexcrichton Jan 15, 2019

In-line Jan 17, 2019

dwijnand Jan 17, 2019

In-line commented Jan 14, 2019

In-line Jan 19, 2019 •

edited

Loading

dwijnand Jan 20, 2019

dwijnand commented Jan 20, 2019

bors commented Jan 20, 2019

bors commented Jan 20, 2019

bors commented Jan 20, 2019

Perhaps you meant: foo, bar or foobar #6550

Perhaps you meant: foo, bar or foobar #6550

Conversation

In-line commented Jan 14, 2019 • edited Loading

rust-highfive commented Jan 14, 2019

alexcrichton Jan 14, 2019

Choose a reason for hiding this comment

In-line Jan 14, 2019 • edited Loading

Choose a reason for hiding this comment

alexcrichton Jan 15, 2019

Choose a reason for hiding this comment

dwijnand Jan 15, 2019

Choose a reason for hiding this comment

alexcrichton Jan 15, 2019

Choose a reason for hiding this comment

In-line Jan 17, 2019

Choose a reason for hiding this comment

dwijnand Jan 17, 2019

Choose a reason for hiding this comment

In-line commented Jan 14, 2019

In-line Jan 19, 2019 • edited Loading

Choose a reason for hiding this comment

dwijnand Jan 20, 2019

Choose a reason for hiding this comment

dwijnand commented Jan 20, 2019

bors commented Jan 20, 2019

bors commented Jan 20, 2019

bors commented Jan 20, 2019

In-line commented Jan 14, 2019 •

edited

Loading

In-line Jan 14, 2019 •

edited

Loading

In-line Jan 19, 2019 •

edited

Loading