Skip to content

Commit 2f1bc91

Browse files
committedMay 4, 2019
Auto merge of #60537 - Centril:rollup-42jxz82, r=Centril
Rollup of 9 pull requests Successful merges: - #60429 (Account for paths in incorrect pub qualifier help) - #60449 (Constrain all regions in the concrete type for an opaque type) - #60486 (Place related refactors) - #60513 (Remove -Z borrowck=compare flag) - #60516 (Remove TypeckMir) - #60517 (Reword casting message) - #60520 (Add rustfmt toml) - #60521 (Migrate tidy to rust 2018 edition) - #60527 (Fix async fn lowering ICE with APIT.) Failed merges: r? @ghost
2 parents e232636 + 1599877 commit 2f1bc91

File tree

90 files changed

+562
-1100
lines changed

Some content is hidden

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

90 files changed

+562
-1100
lines changed
 

‎rustfmt.toml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Currently, most of the code in the compiler uses historical style.
2+
#
3+
# For new code, consider running rustfmt with this config (it should
4+
# be picked up automatically).
5+
version = "Two"
6+
use_small_heuristics = "Max"

‎src/librustc/hir/map/def_collector.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,12 @@ impl<'a> DefCollector<'a> {
9292
visit::walk_generics(this, generics);
9393

9494
// Walk the generated arguments for the `async fn`.
95-
for a in arguments {
95+
for (i, a) in arguments.iter().enumerate() {
9696
use visit::Visitor;
9797
if let Some(arg) = &a.arg {
9898
this.visit_ty(&arg.ty);
99+
} else {
100+
this.visit_ty(&decl.inputs[i].ty);
99101
}
100102
}
101103

0 commit comments

Comments
 (0)