while let all the things
This commit is contained in:
parent
e2746d8700
commit
2e7e68b762
@ -2208,13 +2208,8 @@ impl<'a> State<'a> {
|
||||
if self.next_comment().is_none() {
|
||||
self.s.hardbreak()?;
|
||||
}
|
||||
loop {
|
||||
match self.next_comment() {
|
||||
Some(ref cmnt) => {
|
||||
self.print_comment(cmnt)?;
|
||||
}
|
||||
_ => break,
|
||||
}
|
||||
while let Some(ref cmnt) = self.next_comment() {
|
||||
self.print_comment(cmnt)?
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
@ -206,11 +206,7 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
|
||||
// Step 2: Mark all symbols that the symbols on the worklist touch.
|
||||
fn propagate(&mut self) {
|
||||
let mut scanned = FxHashSet();
|
||||
loop {
|
||||
let search_item = match self.worklist.pop() {
|
||||
Some(item) => item,
|
||||
None => break,
|
||||
};
|
||||
while let Some(search_item) = self.worklist.pop() {
|
||||
if !scanned.insert(search_item) {
|
||||
continue
|
||||
}
|
||||
|
@ -415,13 +415,7 @@ impl<O: ForestObligation> ObligationForest<O> {
|
||||
}
|
||||
}
|
||||
|
||||
loop {
|
||||
// non-standard `while let` to bypass #6393
|
||||
let i = match error_stack.pop() {
|
||||
Some(i) => i,
|
||||
None => break
|
||||
};
|
||||
|
||||
while let Some(i) = error_stack.pop() {
|
||||
let node = &self.nodes[i];
|
||||
|
||||
match node.state.get() {
|
||||
|
@ -428,20 +428,15 @@ impl fmt::Debug for Wtf8 {
|
||||
|
||||
formatter.write_str("\"")?;
|
||||
let mut pos = 0;
|
||||
loop {
|
||||
match self.next_surrogate(pos) {
|
||||
None => break,
|
||||
Some((surrogate_pos, surrogate)) => {
|
||||
write_str_escaped(
|
||||
formatter,
|
||||
unsafe { str::from_utf8_unchecked(
|
||||
&self.bytes[pos .. surrogate_pos]
|
||||
)},
|
||||
)?;
|
||||
write!(formatter, "\\u{{{:x}}}", surrogate)?;
|
||||
pos = surrogate_pos + 3;
|
||||
}
|
||||
}
|
||||
while let Some((surrogate_pos, surrogate)) = self.next_surrogate(pos) {
|
||||
write_str_escaped(
|
||||
formatter,
|
||||
unsafe { str::from_utf8_unchecked(
|
||||
&self.bytes[pos .. surrogate_pos]
|
||||
)},
|
||||
)?;
|
||||
write!(formatter, "\\u{{{:x}}}", surrogate)?;
|
||||
pos = surrogate_pos + 3;
|
||||
}
|
||||
write_str_escaped(
|
||||
formatter,
|
||||
|
@ -732,18 +732,13 @@ pub fn expand_preparsed_format_args(ecx: &mut ExtCtxt,
|
||||
let mut parser = parse::Parser::new(fmt_str);
|
||||
let mut pieces = vec![];
|
||||
|
||||
loop {
|
||||
match parser.next() {
|
||||
Some(mut piece) => {
|
||||
if !parser.errors.is_empty() {
|
||||
break;
|
||||
}
|
||||
cx.verify_piece(&piece);
|
||||
cx.resolve_name_inplace(&mut piece);
|
||||
pieces.push(piece);
|
||||
}
|
||||
None => break,
|
||||
while let Some(mut piece) = parser.next() {
|
||||
if !parser.errors.is_empty() {
|
||||
break;
|
||||
}
|
||||
cx.verify_piece(&piece);
|
||||
cx.resolve_name_inplace(&mut piece);
|
||||
pieces.push(piece);
|
||||
}
|
||||
|
||||
let numbered_position_args = pieces.iter().any(|arg: &parse::Piece| {
|
||||
|
@ -322,12 +322,7 @@ impl Span {
|
||||
pub fn macro_backtrace(mut self) -> Vec<MacroBacktrace> {
|
||||
let mut prev_span = DUMMY_SP;
|
||||
let mut result = vec![];
|
||||
loop {
|
||||
let info = match self.ctxt().outer().expn_info() {
|
||||
Some(info) => info,
|
||||
None => break,
|
||||
};
|
||||
|
||||
while let Some(info) = self.ctxt().outer().expn_info() {
|
||||
let (pre, post) = match info.callee.format {
|
||||
ExpnFormat::MacroAttribute(..) => ("#[", "]"),
|
||||
ExpnFormat::MacroBang(..) => ("", "!"),
|
||||
|
Loading…
Reference in New Issue
Block a user