Skip to content

Commit 7ce62af

Browse files
authored
Rollup merge of rust-lang#139741 - os-checker:smir-run-macro, r=scottmcm
fix smir's run! doc and import This PR * adds missing `extern crate rustc_middle` in `rustc_smir::run!` docstring * adds missing `use rustc_smir::rustc_internal` in `run_driver!` scope * also adjust some tests that don't need to import rustc_internalany more
2 parents 7ba09db + 6d5f6fd commit 7ce62af

22 files changed

+3
-21
lines changed

compiler/rustc_smir/src/rustc_internal/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ where
244244
/// ```ignore(needs-extern-crate)
245245
/// # extern crate rustc_driver;
246246
/// # extern crate rustc_interface;
247+
/// # extern crate rustc_middle;
247248
/// # #[macro_use]
248249
/// # extern crate rustc_smir;
249250
/// # extern crate stable_mir;
@@ -264,6 +265,7 @@ where
264265
/// ```ignore(needs-extern-crate)
265266
/// # extern crate rustc_driver;
266267
/// # extern crate rustc_interface;
268+
/// # extern crate rustc_middle;
267269
/// # #[macro_use]
268270
/// # extern crate rustc_smir;
269271
/// # extern crate stable_mir;
@@ -328,6 +330,7 @@ macro_rules! run_driver {
328330
use rustc_driver::{Callbacks, Compilation, run_compiler};
329331
use rustc_middle::ty::TyCtxt;
330332
use rustc_interface::interface;
333+
use rustc_smir::rustc_internal;
331334
use stable_mir::CompilerError;
332335
use std::ops::ControlFlow;
333336

tests/ui-fulldeps/stable-mir/check_abi.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_driver;
1717
extern crate rustc_interface;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use stable_mir::abi::{
2221
ArgAbi, CallConvention, FieldsShape, IntegerLength, PassMode, Primitive, Scalar, ValueAbi,
2322
VariantsShape,

tests/ui-fulldeps/stable-mir/check_allocation.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ extern crate rustc_driver;
1919
extern crate rustc_interface;
2020
extern crate stable_mir;
2121

22-
use rustc_smir::rustc_internal;
2322
use stable_mir::crate_def::CrateDef;
2423
use stable_mir::mir::alloc::GlobalAlloc;
2524
use stable_mir::mir::mono::{Instance, InstanceKind, StaticDef};

tests/ui-fulldeps/stable-mir/check_assoc_items.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_driver;
1717
extern crate rustc_interface;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use std::io::Write;
2221
use std::collections::HashSet;
2322
use stable_mir::CrateDef;

tests/ui-fulldeps/stable-mir/check_attribute.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ extern crate rustc_driver;
1515
extern crate rustc_interface;
1616
extern crate stable_mir;
1717

18-
use rustc_smir::rustc_internal;
1918
use stable_mir::{CrateDef, CrateItems};
2019
use std::io::Write;
2120
use std::ops::ControlFlow;

tests/ui-fulldeps/stable-mir/check_binop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ extern crate rustc_driver;
1515
extern crate rustc_interface;
1616
extern crate stable_mir;
1717

18-
use rustc_smir::rustc_internal;
1918
use stable_mir::mir::mono::Instance;
2019
use stable_mir::mir::visit::{Location, MirVisitor};
2120
use stable_mir::mir::{LocalDecl, Rvalue, Statement, StatementKind, Terminator, TerminatorKind};

tests/ui-fulldeps/stable-mir/check_crate_defs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ extern crate rustc_driver;
1616
extern crate rustc_interface;
1717
extern crate stable_mir;
1818

19-
use rustc_smir::rustc_internal;
2019
use stable_mir::CrateDef;
2120
use std::collections::HashSet;
2221
use std::io::Write;

tests/ui-fulldeps/stable-mir/check_def_ty.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_driver;
1717
extern crate rustc_interface;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use stable_mir::ty::{Ty, ForeignItemKind};
2221
use stable_mir::*;
2322
use std::io::Write;

tests/ui-fulldeps/stable-mir/check_defs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ extern crate stable_mir;
1919
use std::assert_matches::assert_matches;
2020
use mir::{mono::Instance, TerminatorKind::*};
2121
use stable_mir::mir::mono::InstanceKind;
22-
use rustc_smir::rustc_internal;
2322
use stable_mir::ty::{RigidTy, TyKind, Ty, UintTy};
2423
use stable_mir::*;
2524
use std::io::Write;

tests/ui-fulldeps/stable-mir/check_foreign.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_interface;
1717
extern crate rustc_span;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use stable_mir::{
2221
ty::{Abi, ForeignItemKind},
2322
*,

tests/ui-fulldeps/stable-mir/check_instance.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use std::ops::ControlFlow;
2121

2222
use mir::mono::Instance;
2323
use mir::TerminatorKind::*;
24-
use rustc_smir::rustc_internal;
2524
use stable_mir::ty::{RigidTy, TyKind};
2625
use stable_mir::*;
2726

tests/ui-fulldeps/stable-mir/check_intrinsics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ extern crate rustc_driver;
2020
extern crate rustc_interface;
2121
extern crate stable_mir;
2222

23-
use rustc_smir::rustc_internal;
2423
use stable_mir::mir::mono::{Instance, InstanceKind};
2524
use stable_mir::mir::visit::{Location, MirVisitor};
2625
use stable_mir::mir::{LocalDecl, Terminator, TerminatorKind};

tests/ui-fulldeps/stable-mir/check_item_kind.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ extern crate rustc_driver;
1616
extern crate rustc_interface;
1717
extern crate stable_mir;
1818

19-
use rustc_smir::rustc_internal;
2019
use stable_mir::*;
2120
use std::io::Write;
2221
use std::ops::ControlFlow;

tests/ui-fulldeps/stable-mir/check_normalization.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate stable_mir;
1717

1818
use mir::mono::Instance;
1919
use ty::{Ty, TyKind, RigidTy};
20-
use rustc_smir::rustc_internal;
2120
use stable_mir::*;
2221
use std::io::Write;
2322
use std::ops::ControlFlow;

tests/ui-fulldeps/stable-mir/check_trait_queries.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ extern crate rustc_driver;
1616
extern crate rustc_interface;
1717
extern crate stable_mir;
1818

19-
use rustc_smir::rustc_internal;
2019
use stable_mir::CrateDef;
2120
use std::collections::HashSet;
2221
use std::io::Write;

tests/ui-fulldeps/stable-mir/check_transform.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_driver;
1717
extern crate rustc_interface;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use stable_mir::mir::alloc::GlobalAlloc;
2221
use stable_mir::mir::mono::Instance;
2322
use stable_mir::mir::{Body, ConstOperand, Operand, Rvalue, StatementKind, TerminatorKind};

tests/ui-fulldeps/stable-mir/check_ty_fold.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_driver;
1717
extern crate rustc_interface;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use stable_mir::mir::{
2221
Body, FieldIdx, MirVisitor, Place, ProjectionElem,
2322
visit::{Location, PlaceContext},

tests/ui-fulldeps/stable-mir/compilation-result.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ extern crate rustc_driver;
1616
extern crate rustc_interface;
1717
extern crate stable_mir;
1818

19-
use rustc_smir::rustc_internal;
2019
use std::io::Write;
2120

2221
/// This test will generate and analyze a dummy crate using the stable mir.

tests/ui-fulldeps/stable-mir/crate-info.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ extern crate rustc_interface;
1818
extern crate stable_mir;
1919

2020
use rustc_hir::def::DefKind;
21-
use rustc_smir::rustc_internal;
2221
use stable_mir::ItemKind;
2322
use stable_mir::crate_def::CrateDef;
2423
use stable_mir::mir::mono::Instance;

tests/ui-fulldeps/stable-mir/projections.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate rustc_driver;
1717
extern crate rustc_interface;
1818
extern crate stable_mir;
1919

20-
use rustc_smir::rustc_internal;
2120
use stable_mir::ItemKind;
2221
use stable_mir::crate_def::CrateDef;
2322
use stable_mir::mir::{ProjectionElem, Rvalue, StatementKind};

tests/ui-fulldeps/stable-mir/smir_serde.rs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ extern crate serde_json;
1919
extern crate stable_mir;
2020

2121
use rustc_middle::ty::TyCtxt;
22-
use rustc_smir::rustc_internal;
2322
use serde_json::to_string;
2423
use stable_mir::mir::Body;
2524
use std::io::{BufWriter, Write};

tests/ui-fulldeps/stable-mir/smir_visitor.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ extern crate rustc_driver;
1616
extern crate rustc_interface;
1717
extern crate stable_mir;
1818

19-
use rustc_smir::rustc_internal;
2019
use stable_mir::mir::MirVisitor;
2120
use stable_mir::mir::MutMirVisitor;
2221
use stable_mir::*;

0 commit comments

Comments
 (0)