//
use State::*;
+use rustc_ast::ast::{self, AsmDialect};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, Token};
+use rustc_ast::tokenstream::{self, TokenStream};
use rustc_errors::{struct_span_err, DiagnosticBuilder, PResult};
use rustc_expand::base::*;
use rustc_parse::parser::Parser;
use rustc_span::symbol::{kw, sym, Symbol};
use rustc_span::Span;
-use syntax::ast::{self, AsmDialect};
-use syntax::ptr::P;
-use syntax::token::{self, Token};
-use syntax::tokenstream::{self, TokenStream};
enum State {
Asm,
let constraint = parse_asm_str(&mut p)?;
- let span = p.prev_span;
+ let span = p.prev_token.span;
p.expect(&token::OpenDelim(token::Paren))?;
let expr = p.parse_expr()?;
};
let is_rw = output.is_some();
- let is_indirect = constraint_str.contains("*");
+ let is_indirect = constraint_str.contains('*');
outputs.push(ast::InlineAsmOutput {
constraint: output.unwrap_or(constraint),
expr,
let constraint = parse_asm_str(&mut p)?;
- if constraint.as_str().starts_with("=") {
+ if constraint.as_str().starts_with('=') {
struct_span_err!(
cx.parse_sess.span_diagnostic,
- p.prev_span,
+ p.prev_token.span,
E0662,
"input operand constraint contains '='"
)
.emit();
- } else if constraint.as_str().starts_with("+") {
+ } else if constraint.as_str().starts_with('+') {
struct_span_err!(
cx.parse_sess.span_diagnostic,
- p.prev_span,
+ p.prev_token.span,
E0663,
"input operand constraint contains '+'"
)
let s = parse_asm_str(&mut p)?;
if OPTIONS.iter().any(|&opt| s == opt) {
- cx.span_warn(p.prev_span, "expected a clobber, found an option");
- } else if s.as_str().starts_with("{") || s.as_str().ends_with("}") {
+ cx.span_warn(p.prev_token.span, "expected a clobber, found an option");
+ } else if s.as_str().starts_with('{') || s.as_str().ends_with('}') {
struct_span_err!(
cx.parse_sess.span_diagnostic,
- p.prev_span,
+ p.prev_token.span,
E0664,
"clobber should not be surrounded by braces"
)
} else if option == sym::intel {
dialect = AsmDialect::Intel;
} else {
- cx.span_warn(p.prev_span, "unrecognized option");
+ cx.span_warn(p.prev_token.span, "unrecognized option");
}
if p.token == token::Comma {