fix demo

Author: makai410

demo/Cargo.lock

@@ -5,6 +5,9 @@ version = "0.0.0"
 edition = "2021"
 
 [dependencies]
+rustc_public = { path = "../", features = ["rustc_internal"] }
+
+[workspace]
 
 [package.metadata.rust-analyzer]
 # This crate uses #[feature(rustc_private)].

demo/Cargo.toml

@@ -6,5 +6,5 @@ REPO_DIR=$(git rev-parse --show-toplevel)
 DEMO_DIR="${REPO_DIR}/demo"
 
 cd "${DEMO_DIR}"
-cargo run -- src/main.rs --crate-name demo --edition 2021 -C panic=abort
+cargo run -- ../tests/print/basic_function.rs --crate-name bf --edition 2021 -C panic=abort
 

demo/run_demo.sh

@@ -5,42 +5,40 @@
 
 extern crate rustc_driver;
 extern crate rustc_interface;
-#[macro_use]
-extern crate rustc_smir;
-extern crate stable_mir;
+extern crate rustc_middle;
 
 use std::collections::HashSet;
 use std::io::stdout;
-use rustc_smir::{run, rustc_internal};
-use stable_mir::{CompilerError, CrateDef};
+use rustc_public::run;
+use rustc_public::{CompilerError, CrateDef};
 use std::ops::ControlFlow;
 use std::process::ExitCode;
-use stable_mir::mir::{LocalDecl, MirVisitor, Terminator, TerminatorKind};
-use stable_mir::mir::mono::Instance;
-use stable_mir::mir::visit::Location;
-use stable_mir::ty::{RigidTy, Ty, TyKind};
+use rustc_public::mir::{LocalDecl, MirVisitor, Terminator, TerminatorKind};
+use rustc_public::mir::mono::Instance;
+use rustc_public::mir::visit::Location;
+use rustc_public::ty::{RigidTy, Ty, TyKind};
 
 
 /// This is a wrapper that can be used to replace rustc.
 fn main() -> ExitCode {
-    let rustc_args = std::env::args().into_iter().collect();
-    let result = run!(rustc_args, start_demo);
+    let rustc_args: Vec<String> = std::env::args().collect();
+    let result = run!(&rustc_args, start_demo);
     match result {
         Ok(_) | Err(CompilerError::Skipped | CompilerError::Interrupted(_)) => ExitCode::SUCCESS,
         _ => ExitCode::FAILURE,
     }
 }
 
 fn start_demo() -> ControlFlow<()> {
-    let crate_name = stable_mir::local_crate().name;
+    let crate_name = rustc_public::local_crate().name;
     eprintln!("--- Analyzing crate: {crate_name}");
 
-    let crate_items = stable_mir::all_local_items();
+    let crate_items = rustc_public::all_local_items();
     for item in crate_items {
         eprintln!("  - {} @{:?}", item.name(), item.span())
     }
 
-    let entry_fn = stable_mir::entry_fn().unwrap();
+    let entry_fn = rustc_public::entry_fn().unwrap();
     let entry_instance = Instance::try_from(entry_fn).unwrap();
     analyze_instance(entry_instance);
     ControlFlow::Break(())