stacked -> stacked_borrows

Author: Vanille-N

src/borrow_tracker/mod.rs

@@ -1,5 +1,3 @@
-pub mod stacked;
-
 use std::cell::RefCell;
 use std::fmt;
 use std::num::NonZeroU64;
@@ -11,7 +9,8 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_middle::mir;
 
 use crate::*;
-use stacked::diagnostics::RetagCause;
+pub mod stacked_borrows;
+use stacked_borrows::diagnostics::RetagCause;
 
 pub type CallId = NonZeroU64;
 
@@ -305,20 +304,20 @@ impl Method {
 #[derive(Debug, Clone)]
 pub enum AllocExtra {
     /// Data corresponding to Stacked Borrows
-    StackedBorrows(Box<RefCell<stacked::AllocExtra>>),
+    StackedBorrows(Box<RefCell<stacked_borrows::AllocExtra>>),
     /// No data because borrow tracking is deactivated
     None,
 }
 
 impl AllocExtra {
-    pub fn assert_sb(&self) -> &RefCell<stacked::AllocExtra> {
+    pub fn assert_sb(&self) -> &RefCell<stacked_borrows::AllocExtra> {
         match self {
             AllocExtra::StackedBorrows(ref sb) => sb,
             AllocExtra::None => panic!("Expected Stacked Borrows data, got nothing"),
         }
     }
 
-    pub fn assert_sb_mut(&mut self) -> &mut RefCell<stacked::AllocExtra> {
+    pub fn assert_sb_mut(&mut self) -> &mut RefCell<stacked_borrows::AllocExtra> {
         match self {
             AllocExtra::StackedBorrows(ref mut sb) => sb,
             AllocExtra::None => panic!("Expected Stacked Borrows data, got nothing"),

src/borrow_tracker/stacked/diagnostics.rs renamed to src/borrow_tracker/stacked_borrows/diagnostics.rs

@@ -6,7 +6,7 @@ use rustc_span::{Span, SpanData};
 use rustc_target::abi::Size;
 
 use crate::borrow_tracker::{
-    stacked::{err_sb_ub, Permission},
+    stacked_borrows::{err_sb_ub, Permission},
     AccessKind, GlobalStateInner, ProtectorKind,
 };
 use crate::*;

src/borrow_tracker/stacked/item.rs renamed to src/borrow_tracker/stacked_borrows/item.rs

@@ -16,7 +16,7 @@ use rustc_middle::ty::{
 };
 
 use crate::borrow_tracker::{
-    stacked::diagnostics::{AllocHistory, DiagnosticCx, DiagnosticCxBuilder, TagHistory},
+    stacked_borrows::diagnostics::{AllocHistory, DiagnosticCx, DiagnosticCxBuilder, TagHistory},
     AccessKind, GlobalState, GlobalStateInner, ProtectorKind, RetagCause, RetagFields,
 };
 use crate::*;

src/borrow_tracker/stacked/mod.rs renamed to src/borrow_tracker/stacked_borrows/mod.rs

@@ -4,7 +4,7 @@ use std::ops::Range;
 use rustc_data_structures::fx::FxHashSet;
 
 use crate::borrow_tracker::{
-    stacked::{Item, Permission},
+    stacked_borrows::{Item, Permission},
     AccessKind, BorTag,
 };
 use crate::ProvenanceExtra;

src/borrow_tracker/stacked/stack.rs renamed to src/borrow_tracker/stacked_borrows/stack.rs

@@ -6,7 +6,7 @@ use log::trace;
 use rustc_span::{source_map::DUMMY_SP, SpanData, Symbol};
 use rustc_target::abi::{Align, Size};
 
-use crate::borrow_tracker::{stacked::diagnostics::TagHistory, AccessKind};
+use crate::borrow_tracker::{stacked_borrows::diagnostics::TagHistory, AccessKind};
 use crate::*;
 
 /// Details of premature program termination.

src/diagnostics.rs

@@ -84,7 +84,7 @@ pub use crate::shims::time::EvalContextExt as _;
 pub use crate::shims::tls::TlsData;
 pub use crate::shims::EvalContextExt as _;
 
-pub use crate::borrow_tracker::stacked::{
+pub use crate::borrow_tracker::stacked_borrows::{
     EvalContextExt as StackedBorEvalContextExt, Item, Permission, Stack, Stacks,
 };
 pub use crate::borrow_tracker::{BorTag, CallId, Method as BorrowTrackerMethod, RetagFields};