Skip to content

Commit cdcbdfd

Browse files
author
Nick Cameron
committed
Fix tests and rustdoc
1 parent c480386 commit cdcbdfd

File tree

11 files changed

+28
-24
lines changed

11 files changed

+28
-24
lines changed

‎src/librustdoc/clean/mod.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4012,6 +4012,8 @@ where F: Fn(DefId) -> Def {
40124012
def: def_ctor(def_id),
40134013
segments: hir::HirVec::from_vec(apb.names.iter().map(|s| hir::PathSegment {
40144014
ident: ast::Ident::from_str(&s),
4015+
id: None,
4016+
def: None,
40154017
args: None,
40164018
infer_types: false,
40174019
}).collect())

‎src/librustdoc/core.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ impl<'a, 'tcx, 'rcx, 'cstore> DocContext<'a, 'tcx, 'rcx, 'cstore> {
186186

187187
segments.push(hir::PathSegment::new(
188188
real_name.unwrap_or(last.ident),
189+
None,
190+
None,
189191
self.generics_to_path_params(generics.clone()),
190192
false,
191193
));

‎src/test/mir-opt/end_region_5.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
3333
// let _1: D;
3434
// ...
3535
// let mut _2: ();
36-
// let mut _3: [closure@NodeId(18) d:&'14s D];
36+
// let mut _3: [closure@NodeId(28) d:&'14s D];
3737
// let mut _4: &'14s D;
3838
// bb0: {
3939
// StorageLive(_1);
@@ -42,7 +42,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
4242
// StorageLive(_3);
4343
// StorageLive(_4);
4444
// _4 = &'14s _1;
45-
// _3 = [closure@NodeId(18)] { d: move _4 };
45+
// _3 = [closure@NodeId(28)] { d: move _4 };
4646
// StorageDead(_4);
4747
// _2 = const foo(move _3) -> [return: bb2, unwind: bb3];
4848
// }
@@ -67,7 +67,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
6767
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
6868

6969
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
70-
// fn main::{{closure}}(_1: [closure@NodeId(18) d:&'14s D]) -> i32 {
70+
// fn main::{{closure}}(_1: [closure@NodeId(28) d:&'14s D]) -> i32 {
7171
// let mut _0: i32;
7272
//
7373
// bb0: {

‎src/test/mir-opt/end_region_6.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
3333
// let _1: D;
3434
// ...
3535
// let mut _2: ();
36-
// let mut _3: [closure@NodeId(22) d:&'19s D];
36+
// let mut _3: [closure@NodeId(33) d:&'19s D];
3737
// let mut _4: &'19s D;
3838
// bb0: {
3939
// StorageLive(_1);
@@ -42,7 +42,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
4242
// StorageLive(_3);
4343
// StorageLive(_4);
4444
// _4 = &'19s _1;
45-
// _3 = [closure@NodeId(22)] { d: move _4 };
45+
// _3 = [closure@NodeId(33)] { d: move _4 };
4646
// StorageDead(_4);
4747
// _2 = const foo(move _3) -> [return: bb2, unwind: bb3];
4848
// }
@@ -66,7 +66,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
6666
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
6767

6868
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
69-
// fn main::{{closure}}(_1: [closure@NodeId(22) d:&'19s D]) -> i32 {
69+
// fn main::{{closure}}(_1: [closure@NodeId(33) d:&'19s D]) -> i32 {
7070
// let mut _0: i32;
7171
// ...
7272
// let _2: &'16_0rs D;

‎src/test/mir-opt/end_region_7.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
3333
// let _1: D;
3434
// ...
3535
// let mut _2: ();
36-
// let mut _3: [closure@NodeId(22) d:D];
36+
// let mut _3: [closure@NodeId(33) d:D];
3737
// bb0: {
3838
// StorageLive(_1);
3939
// _1 = D::{{constructor}}(const 0i32,);
4040
// FakeRead(ForLet, _1);
4141
// StorageLive(_3);
42-
// _3 = [closure@NodeId(22)] { d: move _1 };
42+
// _3 = [closure@NodeId(33)] { d: move _1 };
4343
// _2 = const foo(move _3) -> [return: bb2, unwind: bb4];
4444
// }
4545
// bb1: {
@@ -67,7 +67,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
6767
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
6868

6969
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
70-
// fn main::{{closure}}(_1: [closure@NodeId(22) d:D]) -> i32 {
70+
// fn main::{{closure}}(_1: [closure@NodeId(33) d:D]) -> i32 {
7171
// let mut _0: i32;
7272
// ...
7373
// let _2: &'16_0rs D;

‎src/test/mir-opt/end_region_8.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
3636
// let _1: D;
3737
// ...
3838
// let mut _3: ();
39-
// let mut _4: [closure@NodeId(22) r:&'19s D];
39+
// let mut _4: [closure@NodeId(33) r:&'19s D];
4040
// bb0: {
4141
// StorageLive(_1);
4242
// _1 = D::{{constructor}}(const 0i32,);
@@ -45,7 +45,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
4545
// _2 = &'21_1rs _1;
4646
// FakeRead(ForLet, _2);
4747
// StorageLive(_4);
48-
// _4 = [closure@NodeId(22)] { r: _2 };
48+
// _4 = [closure@NodeId(33)] { r: _2 };
4949
// _3 = const foo(move _4) -> [return: bb2, unwind: bb3];
5050
// }
5151
// bb1: {
@@ -72,7 +72,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7272
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
7373

7474
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
75-
// fn main::{{closure}}(_1: [closure@NodeId(22) r:&'19s D]) -> i32 {
75+
// fn main::{{closure}}(_1: [closure@NodeId(33) r:&'19s D]) -> i32 {
7676
// let mut _0: i32;
7777
//
7878
// bb0: {

‎src/test/mir-opt/inline-closure-borrows-arg.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn foo<T: Copy>(_t: T, q: &i32) -> i32 {
3030
// ...
3131
// bb0: {
3232
// ...
33-
// _3 = [closure@NodeId(39)];
33+
// _3 = [closure@NodeId(53)];
3434
// ...
3535
// _4 = &_3;
3636
// ...

‎src/test/mir-opt/inline-closure.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn foo<T: Copy>(_t: T, q: i32) -> i32 {
2626
// ...
2727
// bb0: {
2828
// ...
29-
// _3 = [closure@NodeId(28)];
29+
// _3 = [closure@NodeId(39)];
3030
// ...
3131
// _4 = &_3;
3232
// ...

‎src/test/mir-opt/validate_1.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ fn main() {
5959
// }
6060
// END rustc.main.EraseRegions.after.mir
6161
// START rustc.main-{{closure}}.EraseRegions.after.mir
62-
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(50)], _2: &ReErased mut i32) -> i32 {
62+
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(65)], _2: &ReErased mut i32) -> i32 {
6363
// ...
6464
// bb0: {
65-
// Validate(Acquire, [_1: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(50)], _2: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
65+
// Validate(Acquire, [_1: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(65)], _2: &ReFree(DefId(0/1:11 ~ validate_1[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
6666
// StorageLive(_3);
6767
// Validate(Suspend(ReScope(Remainder { block: ItemLocalId(25), first_statement_index: 0 })), [(*_2): i32]);
6868
// _3 = &ReErased (*_2);

‎src/test/mir-opt/validate_4.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ fn main() {
4848
// }
4949
// END rustc.write_42.EraseRegions.after.mir
5050
// START rustc.write_42-{{closure}}.EraseRegions.after.mir
51-
// fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(22)], _2: *mut i32) -> () {
51+
// fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(32)], _2: *mut i32) -> () {
5252
// ...
5353
// bb0: {
54-
// Validate(Acquire, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(22)], _2: *mut i32]);
55-
// Validate(Release, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(22)], _2: *mut i32]);
54+
// Validate(Acquire, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(32)], _2: *mut i32]);
55+
// Validate(Release, [_1: &ReFree(DefId(0/1:9 ~ validate_4[317d]::write_42[0]::{{closure}}[0]), BrEnv) [closure@NodeId(32)], _2: *mut i32]);
5656
// (*_2) = const 23i32;
5757
// _0 = ();
5858
// return;
@@ -76,11 +76,11 @@ fn main() {
7676
// }
7777
// END rustc.test.EraseRegions.after.mir
7878
// START rustc.main-{{closure}}.EraseRegions.after.mir
79-
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(60)], _2: &ReErased mut i32) -> bool {
79+
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(80)], _2: &ReErased mut i32) -> bool {
8080
// ...
8181
// bb0: {
82-
// Validate(Acquire, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(60)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
83-
// Validate(Release, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(60)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
82+
// Validate(Acquire, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(80)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
83+
// Validate(Release, [_1: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrEnv) [closure@NodeId(80)], _2: &ReFree(DefId(0/1:10 ~ validate_4[317d]::main[0]::{{closure}}[0]), BrAnon(0)) mut i32]);
8484
// StorageLive(_3);
8585
// ...
8686
// _0 = const write_42(move _3) -> bb1;

0 commit comments

Comments
 (0)