suggestion-diagnostics: as_ref improve snippet #57451

dlrobertson · 2019-01-08T20:04:43Z

Improve the code snippet suggested in suggestion-diagnostics when
suggesting the use of as_ref.

Given:

fn test(x: &usize) {}
fn main() {
    Some(42).map(|x| test(x));
}

Suggest

  help: consider using `as_ref` instead: `as_ref().map`

Instead of

  help: consider using `as_ref` instead: `as_ref().`

rust-highfive · 2019-01-08T20:04:46Z

r? @eddyb

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

rust-highfive · 2019-01-08T20:45:18Z

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

travis_time:end:04ee9a5e:start=1546978089151273248,finish=1546978090321928223,duration=1170654975
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---

[00:05:08] travis_fold:start:tidy
travis_time:start:tidy
tidy check
[00:05:08] tidy error: /checkout/src/librustc_typeck/check/demand.rs:195: line longer than 100 chars
[00:05:10] some tidy checks failed
[00:05:10] 
[00:05:10] 
[00:05:10] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/tidy" "/checkout/src" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "--no-vendor" "--quiet"
[00:05:10] 
[00:05:10] 
[00:05:10] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/tools/tidy
[00:05:10] Build completed unsuccessfully in 0:00:45
[00:05:10] Build completed unsuccessfully in 0:00:45
[00:05:10] Makefile:69: recipe for target 'tidy' failed
[00:05:10] make: *** [tidy] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:094e3067
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Tue Jan  8 20:13:40 UTC 2019
---
travis_time:end:0148d452:start=1546978421677496844,finish=1546978421682105515,duration=4608671
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:03c82578
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:2f41bc7b
travis_time:start:2f41bc7b
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0247d91f
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

estebank · 2019-01-10T01:13:13Z

src/librustc_typeck/check/demand.rs

@@ -191,7 +192,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
    /// ```
    /// opt.map(|arg| { takes_ref(arg) });
    /// ```
-    fn can_use_as_ref(&self, expr: &hir::Expr) -> Option<(Span, &'static str, String)> {
+    fn can_use_as_ref(&self, expr: &hir::Expr, cm: &SourceMap)
+            -> Option<(Span, &'static str, String)> {


Formatting:

fn can_use_as_ref( &self, expr: &hir::Expr, cm: &SourceMap, ) -> Option<(Span, &'static str, String)> {

src/librustc_typeck/check/demand.rs

TimNN · 2019-01-29T18:11:03Z

Ping from triage @dlrobertson: Some changes have been requested to your PR.

TimNN · 2019-01-29T18:11:40Z

Also, @estebank: Can you review this PR? It seems like @eddyb is unavailable at the moment.

estebank · 2019-01-29T18:43:32Z

r? @estebank

dlrobertson · 2019-01-29T19:02:25Z

👍 thanks for the ping. I'll look at this tonight.

dlrobertson · 2019-02-13T15:06:55Z

@estebank updated

Improve the code snippet suggested in suggestion-diagnostics when suggesting the use of as_ref.

estebank

r=me once the nitpick is addressed :)

src/librustc_typeck/check/demand.rs

dlrobertson · 2019-02-13T18:25:20Z

@bors r=estebank

bors · 2019-02-13T18:25:21Z

@dlrobertson: 🔑 Insufficient privileges: Not in reviewers

dlrobertson · 2019-02-13T18:30:41Z

@estebank looks like you'll need to r or delegate the PR... Unless I missed something.

estebank · 2019-02-13T19:35:36Z

@bors r+

bors · 2019-02-13T19:35:37Z

📌 Commit 285d4a7 has been approved by estebank

…stebank suggestion-diagnostics: as_ref improve snippet Improve the code snippet suggested in suggestion-diagnostics when suggesting the use of as_ref. Given: ```rust fn test(x: &usize) {} fn main() { Some(42).map(|x| test(x)); } ``` Suggest ``` help: consider using `as_ref` instead: `as_ref().map` ``` Instead of ``` help: consider using `as_ref` instead: `as_ref().` ```

@ghost

Rollup of 8 pull requests Successful merges: - #57451 (suggestion-diagnostics: as_ref improve snippet) - #57856 (Convert old first edition links to current edition one) - #57992 (Update the future/task API) - #58258 (Reduce the size of `hir::Expr`.) - #58267 (Tweak "incompatible match arms" error) - #58296 (Hidden suggestion support) - #58301 (Enable comparing fat pointers) - #58308 (Extract block to insert an intrinsic into its own function) Failed merges: r? @ghost

rust-highfive assigned eddyb Jan 8, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2019

dlrobertson force-pushed the can_use_as_ref_nit branch from 94fe935 to b244e51 Compare January 8, 2019 22:01

estebank approved these changes Jan 10, 2019

View reviewed changes

TimNN added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2019

rust-highfive assigned estebank and unassigned eddyb Jan 29, 2019

dlrobertson force-pushed the can_use_as_ref_nit branch 2 times, most recently from 8015e91 to 47f16e9 Compare February 3, 2019 21:47

suggestion-diagnostics: as_ref improve snippet

285d4a7

Improve the code snippet suggested in suggestion-diagnostics when suggesting the use of as_ref.

estebank approved these changes Feb 13, 2019

View reviewed changes

src/librustc_typeck/check/demand.rs Outdated Show resolved Hide resolved

dlrobertson force-pushed the can_use_as_ref_nit branch from 47f16e9 to 285d4a7 Compare February 13, 2019 18:24

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 13, 2019

Centril mentioned this pull request Feb 14, 2019

Rollup of 8 pull requests #58445

Closed

Centril mentioned this pull request Feb 14, 2019

Rollup of 8 pull requests #58446

Merged

bors merged commit 285d4a7 into rust-lang:master Feb 14, 2019

dlrobertson deleted the can_use_as_ref_nit branch February 14, 2019 14:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

suggestion-diagnostics: as_ref improve snippet #57451

suggestion-diagnostics: as_ref improve snippet #57451

Uh oh!

dlrobertson commented Jan 8, 2019

Uh oh!

rust-highfive commented Jan 8, 2019

Uh oh!

rust-highfive commented Jan 8, 2019

Uh oh!

estebank Jan 10, 2019

Uh oh!

Uh oh!

TimNN commented Jan 29, 2019

Uh oh!

TimNN commented Jan 29, 2019

Uh oh!

estebank commented Jan 29, 2019

Uh oh!

dlrobertson commented Jan 29, 2019

Uh oh!

dlrobertson commented Feb 13, 2019

Uh oh!

estebank left a comment

Uh oh!

Uh oh!

dlrobertson commented Feb 13, 2019

Uh oh!

bors commented Feb 13, 2019

Uh oh!

dlrobertson commented Feb 13, 2019 •

edited

Loading

Uh oh!

estebank commented Feb 13, 2019

Uh oh!

bors commented Feb 13, 2019

Uh oh!

Uh oh!

suggestion-diagnostics: as_ref improve snippet #57451

suggestion-diagnostics: as_ref improve snippet #57451

Uh oh!

Conversation

dlrobertson commented Jan 8, 2019

Uh oh!

rust-highfive commented Jan 8, 2019

Uh oh!

rust-highfive commented Jan 8, 2019

Uh oh!

estebank Jan 10, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

TimNN commented Jan 29, 2019

Uh oh!

TimNN commented Jan 29, 2019

Uh oh!

estebank commented Jan 29, 2019

Uh oh!

dlrobertson commented Jan 29, 2019

Uh oh!

dlrobertson commented Feb 13, 2019

Uh oh!

estebank left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dlrobertson commented Feb 13, 2019

Uh oh!

bors commented Feb 13, 2019

Uh oh!

dlrobertson commented Feb 13, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

estebank commented Feb 13, 2019

Uh oh!

bors commented Feb 13, 2019

Uh oh!

Uh oh!

dlrobertson commented Feb 13, 2019 •

edited

Loading