mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix miri-opt tests

Browse source
This commit is contained in:
Takayuki Maeda 2022-07-06 10:47:29 +09:00
parent 0541b4e034
commit b730bc9f20
4 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
compiler/rustc_lint/src/builtin.rs
View file

@ -577,16 +577,12 @@ impl MissingDoc {
let attrs = cx.tcx.hir().attrs(cx.tcx.hir().local_def_id_to_hir_id(def_id)); let attrs = cx.tcx.hir().attrs(cx.tcx.hir().local_def_id_to_hir_id(def_id));
let has_doc = attrs.iter().any(has_doc); let has_doc = attrs.iter().any(has_doc);
if !has_doc { if !has_doc {
cx.struct_span_lint( cx.struct_span_lint(MISSING_DOCS, cx.tcx.def_span(def_id), |lint| {
MISSING_DOCS, lint.build(fluent::lint::builtin_missing_doc)
cx.tcx.sess.source_map().guess_head_span(sp), .set_arg("article", article)
|lint| { .set_arg("desc", desc)
lint.build(fluent::lint::builtin_missing_doc) .emit();
.set_arg("article", article) });
.set_arg("desc", desc)
.emit();
},
);
} }
} }
} }

10
src/test/mir-opt/unusual_item_types.Test-X-{constructor#0}.mir_map.0.32bit.mir
View file

@ -1,12 +1,12 @@
// MIR for `Test::X` 0 mir_map // MIR for `Test::X` 0 mir_map
fn Test::X(_1: usize) -> Test { fn Test::X(_1: usize) -> Test {
let mut _0: Test; // return place in scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 let mut _0: Test; // return place in scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
bb0: { bb0: {
Deinit(_0); // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 Deinit(_0); // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 ((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
discriminant(_0) = 0; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 discriminant(_0) = 0; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
return; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 return; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
} }
} }

10
src/test/mir-opt/unusual_item_types.Test-X-{constructor#0}.mir_map.0.64bit.mir
View file

@ -1,12 +1,12 @@
// MIR for `Test::X` 0 mir_map // MIR for `Test::X` 0 mir_map
fn Test::X(_1: usize) -> Test { fn Test::X(_1: usize) -> Test {
let mut _0: Test; // return place in scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 let mut _0: Test; // return place in scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
bb0: { bb0: {
Deinit(_0); // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 Deinit(_0); // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 ((_0 as X).0: usize) = move _1; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
discriminant(_0) = 0; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 discriminant(_0) = 0; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
return; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:13 return; // scope 0 at $DIR/unusual-item-types.rs:16:5: 16:6
} }
} }

2
src/tools/clippy/tests/ui/crashes/ice-6252.stderr
View file

@ -28,7 +28,7 @@ LL | const VAL: T;
| ------------ `VAL` from trait | ------------ `VAL` from trait
... ...
LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {} LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `VAL` in implementation | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `VAL` in implementation
error: constant expression depends on a generic parameter error: constant expression depends on a generic parameter
--> $DIR/ice-6252.rs:13:9 --> $DIR/ice-6252.rs:13:9