Commit 4aecfa9

committed

introduce Mutability::ptr_str

1 parent 8bc5491 commit 4aecfa9Copy full SHA for 4aecfa9

File tree

+12

-24

lines changed

+12

-24

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,14 @@ impl Mutability {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
	`54`	+ /// Returns `"const"` or `"mut"` depending on the mutability.
	`55`	`+ pub fn ptr_str(self) -> &'static str {`
	`56`	`+ match self {`
	`57`	`+ Mutability::Not => "const",`
	`58`	`+ Mutability::Mut => "mut",`
	`59`	`+ }`
	`60`	`+ }`
	`61`	`+`
`54`	`62`	/// Returns `""` (empty string) or `"mutably "` depending on the mutability.
`55`	`63`	`pub fn mutably_str(self) -> &'static str {`
`56`	`64`	`match self {`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -978,12 +978,7 @@ impl<'tcx> Debug for Rvalue<'tcx> {`
`978`	`978`	`CopyForDeref(ref place) => write!(fmt, "deref_copy {place:#?}"),`
`979`	`979`
`980`	`980`	`AddressOf(mutability, ref place) => {`
`981`		`- let kind_str = match mutability {`
`982`		`- Mutability::Mut => "mut",`
`983`		`- Mutability::Not => "const",`
`984`		`- };`
`985`		`-`
`986`		`- write!(fmt, "&raw {kind_str} {place:?}")`
	`981`	`+ write!(fmt, "&raw {mut_str} {place:?}", mut_str = mutability.ptr_str())`
`987`	`982`	`}`
`988`	`983`
`989`	`984`	`Aggregate(ref kind, ref places) => {`

Lines changed: 1 addition & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -668,13 +668,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {`
`668`	`668`	`ty::Uint(t) => p!(write("{}", t.name_str())),`
`669`	`669`	`ty::Float(t) => p!(write("{}", t.name_str())),`
`670`	`670`	`ty::RawPtr(ty, mutbl) => {`
`671`		`- p!(write(`
`672`		`- "*{} ",`
`673`		`- match mutbl {`
`674`		`- hir::Mutability::Mut => "mut",`
`675`		`- hir::Mutability::Not => "const",`
`676`		`- }`
`677`		`- ));`
	`671`	`+ p!(write("*{} ", mutbl.ptr_str()));`
`678`	`672`	`p!(print(ty))`
`679`	`673`	`}`
`680`	`674`	`ty::Ref(r, ty, mutbl) => {`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -363,17 +363,8 @@ impl<I: Interner> DebugWithInfcx<I> for TyKind<I> {`
`363`	`363`	`Str => write!(f, "str"),`
`364`	`364`	`Array(t, c) => write!(f, "[{:?}; {:?}]", &this.wrap(t), &this.wrap(c)),`
`365`	`365`	`Slice(t) => write!(f, "[{:?}]", &this.wrap(t)),`
`366`		`- RawPtr(ty, mutbl) => {`
`367`		`- match mutbl {`
`368`		`- Mutability::Mut => write!(f, "*mut "),`
`369`		`- Mutability::Not => write!(f, "*const "),`
`370`		`- }?;`
`371`		`- write!(f, "{:?}", &this.wrap(ty))`
`372`		`- }`
`373`		`- Ref(r, t, m) => match m {`
`374`		`- Mutability::Mut => write!(f, "&{:?} mut {:?}", &this.wrap(r), &this.wrap(t)),`
`375`		`- Mutability::Not => write!(f, "&{:?} {:?}", &this.wrap(r), &this.wrap(t)),`
`376`		`- },`
	`366`	`+ RawPtr(ty, mutbl) => write!(f, "*{} {:?}", mutbl.ptr_str(), this.wrap(ty)),`
	`367`	`+ Ref(r, t, m) => write!(f, "&{:?} {}{:?}", this.wrap(r), m.prefix_str(), this.wrap(t)),`
`377`	`368`	`FnDef(d, s) => f.debug_tuple("FnDef").field(d).field(&this.wrap(s)).finish(),`
`378`	`369`	`FnPtr(s) => write!(f, "{:?}", &this.wrap(s)),`
`379`	`370`	`Dynamic(p, r, repr) => match repr {`

Comments

(0)