Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4bd3078

Browse files
committedOct 6, 2022
Auto merge of #102726 - matthiaskrgr:rollup-2ghn38b, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #102672 (rustdoc: remove unused CSS class `in-band`) - #102693 (Revert "Use getentropy when possible on all Apple platforms") - #102694 (Suggest calling method if fn does not exist) - #102708 (Suggest `==` to wrong assign expr) - #102710 (Add test for issue 82633) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0152393 + b7642fb commit 4bd3078

File tree

62 files changed

+903
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+903
-502
lines changed
 

‎compiler/rustc_resolve/src/late.rs

+2
Original file line numberDiff line numberDiff line change
@@ -3263,6 +3263,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
32633263
instead,
32643264
suggestion,
32653265
path: path.into(),
3266+
is_call: source.is_call(),
32663267
});
32673268
}
32683269

@@ -3327,6 +3328,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
33273328
instead: false,
33283329
suggestion: None,
33293330
path: path.into(),
3331+
is_call: source.is_call(),
33303332
});
33313333
} else {
33323334
err.cancel();

‎compiler/rustc_resolve/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,8 @@ struct UseError<'a> {
674674
/// Path `Segment`s at the place of use that failed. Used for accurate suggestion after telling
675675
/// the user to import the item directly.
676676
path: Vec<Segment>,
677+
/// Whether the expected source is a call
678+
is_call: bool,
677679
}
678680

679681
#[derive(Clone, Copy, PartialEq, Debug)]
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.