Allow customization of indent offset
Fix typo
auto merge of #6066 : djui/rust/patch-1, r=graydon