2014-05-06 16:52:53 +00:00
|
|
|
//! Macro support for format strings
|
2013-10-13 02:02:46 +00:00
|
|
|
//!
|
|
|
|
//! These structures are used when parsing format strings for the compiler.
|
2014-03-16 22:59:04 +00:00
|
|
|
//! Parsing does not happen at runtime: structures of `std::fmt::rt` are
|
|
|
|
//! generated instead.
|
2013-10-13 02:02:46 +00:00
|
|
|
|
2019-12-22 22:42:04 +00:00
|
|
|
#![doc(
|
2020-09-23 19:14:43 +00:00
|
|
|
html_root_url = "https://doc.rust-lang.org/nightly-rustc/",
|
2019-12-22 22:42:04 +00:00
|
|
|
html_playground_url = "https://play.rust-lang.org/",
|
|
|
|
test(attr(deny(warnings)))
|
|
|
|
)]
|
2019-02-10 07:13:30 +00:00
|
|
|
#![feature(nll)]
|
2020-04-17 00:38:52 +00:00
|
|
|
#![feature(or_patterns)]
|
2019-10-08 00:14:42 +00:00
|
|
|
#![feature(bool_to_option)]
|
2018-08-09 10:48:10 +00:00
|
|
|
|
2019-02-02 17:18:39 +00:00
|
|
|
pub use Alignment::*;
|
|
|
|
pub use Count::*;
|
2019-12-22 22:42:04 +00:00
|
|
|
pub use Flag::*;
|
|
|
|
pub use Piece::*;
|
|
|
|
pub use Position::*;
|
2014-08-13 03:31:30 +00:00
|
|
|
|
2019-12-22 22:42:04 +00:00
|
|
|
use std::iter;
|
2014-05-06 16:52:53 +00:00
|
|
|
use std::str;
|
2014-09-11 05:07:49 +00:00
|
|
|
use std::string;
|
2013-07-29 08:12:41 +00:00
|
|
|
|
2019-12-31 17:15:40 +00:00
|
|
|
use rustc_span::{InnerSpan, Symbol};
|
2019-06-04 15:03:43 +00:00
|
|
|
|
2020-02-12 15:47:43 +00:00
|
|
|
/// The type of format string that we are parsing.
|
|
|
|
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
|
|
|
pub enum ParseMode {
|
|
|
|
/// A normal format string as per `format_args!`.
|
|
|
|
Format,
|
|
|
|
/// An inline assembly template string for `asm!`.
|
|
|
|
InlineAsm,
|
|
|
|
}
|
|
|
|
|
2019-06-04 15:03:43 +00:00
|
|
|
#[derive(Copy, Clone)]
|
|
|
|
struct InnerOffset(usize);
|
|
|
|
|
|
|
|
impl InnerOffset {
|
|
|
|
fn to(self, end: InnerOffset) -> InnerSpan {
|
|
|
|
InnerSpan::new(self.0, end.0)
|
|
|
|
}
|
|
|
|
}
|
2019-06-04 02:47:42 +00:00
|
|
|
|
2014-03-16 22:59:04 +00:00
|
|
|
/// A piece is a portion of the format string which represents the next part
|
|
|
|
/// to emit. These are emitted as a stream by the `Parser` class.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2013-12-10 07:16:18 +00:00
|
|
|
pub enum Piece<'a> {
|
2013-07-29 08:12:41 +00:00
|
|
|
/// A literal string which should directly be emitted
|
2013-12-10 07:16:18 +00:00
|
|
|
String(&'a str),
|
2013-07-29 08:12:41 +00:00
|
|
|
/// This describes that formatting should process the next argument (as
|
|
|
|
/// specified inside) for emission.
|
2014-09-11 05:07:49 +00:00
|
|
|
NextArgument(Argument<'a>),
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Representation of an argument specification.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2013-12-10 07:16:18 +00:00
|
|
|
pub struct Argument<'a> {
|
2013-07-29 08:12:41 +00:00
|
|
|
/// Where to find this argument
|
2019-06-04 02:47:42 +00:00
|
|
|
pub position: Position,
|
2013-07-29 08:12:41 +00:00
|
|
|
/// How to format the argument
|
2014-03-27 22:09:47 +00:00
|
|
|
pub format: FormatSpec<'a>,
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Specification for the formatting of an argument in the format string.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2013-12-10 07:16:18 +00:00
|
|
|
pub struct FormatSpec<'a> {
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// Optionally specified character to fill alignment with.
|
2014-03-27 22:09:47 +00:00
|
|
|
pub fill: Option<char>,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// Optionally specified alignment.
|
2014-03-27 22:09:47 +00:00
|
|
|
pub align: Alignment,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// Packed version of various flags provided.
|
2015-02-23 03:07:38 +00:00
|
|
|
pub flags: u32,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// The integer precision to use.
|
2019-06-04 02:47:42 +00:00
|
|
|
pub precision: Count,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// The span of the precision formatting flag (for diagnostics).
|
|
|
|
pub precision_span: Option<InnerSpan>,
|
|
|
|
/// The string width requested for the resulting format.
|
2019-06-04 02:47:42 +00:00
|
|
|
pub width: Count,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// The span of the width formatting flag (for diagnostics).
|
|
|
|
pub width_span: Option<InnerSpan>,
|
2013-10-13 03:00:58 +00:00
|
|
|
/// The descriptor string representing the name of the format desired for
|
|
|
|
/// this argument, this can be empty or any number of characters, although
|
|
|
|
/// it is required to be one word.
|
2015-10-13 14:10:51 +00:00
|
|
|
pub ty: &'a str,
|
Point at formatting descriptor string when it is invalid
When a formatting string contains an invalid descriptor, point at it
instead of the argument:
```
error: unknown format trait `foo`
--> $DIR/ifmt-bad-arg.rs:86:17
|
LL | println!("{:foo}", 1);
| ^^^
|
= note: the only appropriate formatting traits are:
- ``, which uses the `Display` trait
- `?`, which uses the `Debug` trait
- `e`, which uses the `LowerExp` trait
- `E`, which uses the `UpperExp` trait
- `o`, which uses the `Octal` trait
- `p`, which uses the `Pointer` trait
- `b`, which uses the `Binary` trait
- `x`, which uses the `LowerHex` trait
- `X`, which uses the `UpperHex` trait
```
2019-11-05 19:55:00 +00:00
|
|
|
/// The span of the descriptor string (for diagnostics).
|
|
|
|
pub ty_span: Option<InnerSpan>,
|
2013-10-13 03:00:58 +00:00
|
|
|
}
|
|
|
|
|
2013-07-29 08:12:41 +00:00
|
|
|
/// Enum describing where an argument for a format can be located.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2019-06-04 02:47:42 +00:00
|
|
|
pub enum Position {
|
2018-02-10 11:22:57 +00:00
|
|
|
/// The argument is implied to be located at an index
|
2017-11-09 17:16:25 +00:00
|
|
|
ArgumentImplicitlyIs(usize),
|
|
|
|
/// The argument is located at a specific index given in the format
|
2015-02-23 03:07:38 +00:00
|
|
|
ArgumentIs(usize),
|
2014-03-16 22:59:04 +00:00
|
|
|
/// The argument has a name.
|
2019-06-04 02:47:42 +00:00
|
|
|
ArgumentNamed(Symbol),
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
2019-06-04 02:47:42 +00:00
|
|
|
impl Position {
|
Fix simple formatting optimization
name old2 ns/iter new2 ns/iter diff ns/iter diff % speedup
fmt::write_str_macro1 12,295 12,308 13 0.11% x 1.00
fmt::write_str_macro2 24,079 21,451 -2,628 -10.91% x 1.12
fmt::write_str_macro_debug 238,363 230,807 -7,556 -3.17% x 1.03
fmt::write_str_ref 6,203 6,064 -139 -2.24% x 1.02
fmt::write_str_value 6,225 6,075 -150 -2.41% x 1.02
fmt::write_vec_macro1 17,144 17,121 -23 -0.13% x 1.00
fmt::write_vec_macro2 29,845 26,703 -3,142 -10.53% x 1.12
fmt::write_vec_macro_debug 248,840 242,117 -6,723 -2.70% x 1.03
fmt::write_vec_ref 5,954 6,438 484 8.13% x 0.92
fmt::write_vec_value 5,959 6,439 480 8.06% x 0.93
2019-01-12 04:30:03 +00:00
|
|
|
pub fn index(&self) -> Option<usize> {
|
|
|
|
match self {
|
|
|
|
ArgumentIs(i) | ArgumentImplicitlyIs(i) => Some(*i),
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-16 05:41:28 +00:00
|
|
|
/// Enum of alignments which are supported.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2014-03-16 22:59:04 +00:00
|
|
|
pub enum Alignment {
|
|
|
|
/// The value will be aligned to the left.
|
|
|
|
AlignLeft,
|
|
|
|
/// The value will be aligned to the right.
|
|
|
|
AlignRight,
|
2014-08-30 18:27:02 +00:00
|
|
|
/// The value will be aligned in the center.
|
|
|
|
AlignCenter,
|
2014-03-16 22:59:04 +00:00
|
|
|
/// The value will take on a default alignment.
|
|
|
|
AlignUnknown,
|
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
|
2014-03-16 22:59:04 +00:00
|
|
|
/// Various flags which can be applied to format strings. The meaning of these
|
2013-07-29 08:12:41 +00:00
|
|
|
/// flags is defined by the formatters themselves.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2013-07-29 08:12:41 +00:00
|
|
|
pub enum Flag {
|
2014-03-16 22:59:04 +00:00
|
|
|
/// A `+` will be used to denote positive numbers.
|
2013-07-29 08:12:41 +00:00
|
|
|
FlagSignPlus,
|
2014-03-16 22:59:04 +00:00
|
|
|
/// A `-` will be used to denote negative numbers. This is the default.
|
2013-07-29 08:12:41 +00:00
|
|
|
FlagSignMinus,
|
2014-03-16 22:59:04 +00:00
|
|
|
/// An alternate form will be used for the value. In the case of numbers,
|
|
|
|
/// this means that the number will be prefixed with the supplied string.
|
2013-07-29 08:12:41 +00:00
|
|
|
FlagAlternate,
|
2014-03-16 22:59:04 +00:00
|
|
|
/// For numbers, this means that the number will be padded with zeroes,
|
|
|
|
/// and the sign (`+` or `-`) will precede them.
|
2013-08-10 23:50:42 +00:00
|
|
|
FlagSignAwareZeroPad,
|
2018-03-13 13:08:15 +00:00
|
|
|
/// For Debug / `?`, format integers in lower-case hexadecimal.
|
|
|
|
FlagDebugLowerHex,
|
|
|
|
/// For Debug / `?`, format integers in upper-case hexadecimal.
|
|
|
|
FlagDebugUpperHex,
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// A count is used for the precision and width parameters of an integer, and
|
|
|
|
/// can reference either an argument or a literal integer.
|
2019-11-06 00:02:12 +00:00
|
|
|
#[derive(Copy, Clone, Debug, PartialEq)]
|
2019-06-04 02:47:42 +00:00
|
|
|
pub enum Count {
|
2014-03-16 22:59:04 +00:00
|
|
|
/// The count is specified explicitly.
|
2015-02-23 03:07:38 +00:00
|
|
|
CountIs(usize),
|
2014-03-16 22:59:04 +00:00
|
|
|
/// The count is specified by the argument with the given name.
|
2019-06-04 02:47:42 +00:00
|
|
|
CountIsName(Symbol),
|
2014-03-16 22:59:04 +00:00
|
|
|
/// The count is specified by the argument at the given index.
|
2015-02-23 03:07:38 +00:00
|
|
|
CountIsParam(usize),
|
2014-03-16 22:59:04 +00:00
|
|
|
/// The count is implied and cannot be explicitly specified.
|
2013-07-29 08:12:41 +00:00
|
|
|
CountImplied,
|
|
|
|
}
|
|
|
|
|
2018-05-10 16:09:58 +00:00
|
|
|
pub struct ParseError {
|
|
|
|
pub description: string::String,
|
|
|
|
pub note: Option<string::String>,
|
|
|
|
pub label: string::String,
|
2019-06-04 15:03:43 +00:00
|
|
|
pub span: InnerSpan,
|
|
|
|
pub secondary_label: Option<(string::String, InnerSpan)>,
|
2018-05-10 16:09:58 +00:00
|
|
|
}
|
|
|
|
|
2013-07-29 08:12:41 +00:00
|
|
|
/// The parser structure for interpreting the input format string. This is
|
2015-10-13 13:44:11 +00:00
|
|
|
/// modeled as an iterator over `Piece` structures to form a stream of tokens
|
2013-07-29 08:12:41 +00:00
|
|
|
/// being output.
|
|
|
|
///
|
|
|
|
/// This is a recursive-descent parser for the sake of simplicity, and if
|
|
|
|
/// necessary there's probably lots of room for improvement performance-wise.
|
2013-12-10 07:16:18 +00:00
|
|
|
pub struct Parser<'a> {
|
2020-02-12 15:47:43 +00:00
|
|
|
mode: ParseMode,
|
2014-03-27 22:09:47 +00:00
|
|
|
input: &'a str,
|
2015-09-10 12:03:22 +00:00
|
|
|
cur: iter::Peekable<str::CharIndices<'a>>,
|
Remove std::condition
This has been a long time coming. Conditions in rust were initially envisioned
as being a good alternative to error code return pattern. The idea is that all
errors are fatal-by-default, and you can opt-in to handling the error by
registering an error handler.
While sounding nice, conditions ended up having some unforseen shortcomings:
* Actually handling an error has some very awkward syntax:
let mut result = None;
let mut answer = None;
io::io_error::cond.trap(|e| { result = Some(e) }).inside(|| {
answer = Some(some_io_operation());
});
match result {
Some(err) => { /* hit an I/O error */ }
None => {
let answer = answer.unwrap();
/* deal with the result of I/O */
}
}
This pattern can certainly use functions like io::result, but at its core
actually handling conditions is fairly difficult
* The "zero value" of a function is often confusing. One of the main ideas
behind using conditions was to change the signature of I/O functions. Instead
of read_be_u32() returning a result, it returned a u32. Errors were notified
via a condition, and if you caught the condition you understood that the "zero
value" returned is actually a garbage value. These zero values are often
difficult to understand, however.
One case of this is the read_bytes() function. The function takes an integer
length of the amount of bytes to read, and returns an array of that size. The
array may actually be shorter, however, if an error occurred.
Another case is fs::stat(). The theoretical "zero value" is a blank stat
struct, but it's a little awkward to create and return a zero'd out stat
struct on a call to stat().
In general, the return value of functions that can raise error are much more
natural when using a Result as opposed to an always-usable zero-value.
* Conditions impose a necessary runtime requirement on *all* I/O. In theory I/O
is as simple as calling read() and write(), but using conditions imposed the
restriction that a rust local task was required if you wanted to catch errors
with I/O. While certainly an surmountable difficulty, this was always a bit of
a thorn in the side of conditions.
* Functions raising conditions are not always clear that they are raising
conditions. This suffers a similar problem to exceptions where you don't
actually know whether a function raises a condition or not. The documentation
likely explains, but if someone retroactively adds a condition to a function
there's nothing forcing upstream users to acknowledge a new point of task
failure.
* Libaries using I/O are not guaranteed to correctly raise on conditions when an
error occurs. In developing various I/O libraries, it's much easier to just
return `None` from a read rather than raising an error. The silent contract of
"don't raise on EOF" was a little difficult to understand and threw a wrench
into the answer of the question "when do I raise a condition?"
Many of these difficulties can be overcome through documentation, examples, and
general practice. In the end, all of these difficulties added together ended up
being too overwhelming and improving various aspects didn't end up helping that
much.
A result-based I/O error handling strategy also has shortcomings, but the
cognitive burden is much smaller. The tooling necessary to make this strategy as
usable as conditions were is much smaller than the tooling necessary for
conditions.
Perhaps conditions may manifest themselves as a future entity, but for now
we're going to remove them from the standard library.
Closes #9795
Closes #8968
2014-02-05 03:02:10 +00:00
|
|
|
/// Error messages accumulated during parsing
|
2018-05-10 16:09:58 +00:00
|
|
|
pub errors: Vec<ParseError>,
|
2016-05-16 06:10:54 +00:00
|
|
|
/// Current position of implicit positional argument pointer
|
asm: Allow multiple template strings; interpret them as newline-separated
Allow the `asm!` macro to accept a series of template arguments, and
interpret them as if they were concatenated with a '\n' between them.
This allows writing an `asm!` where each line of assembly appears in a
separate template string argument.
This syntax makes it possible for rustfmt to reliably format and indent
each line of assembly, without risking changes to the inside of a
template string. It also avoids the complexity of having the user
carefully format and indent a multi-line string (including where to put
the surrounding quotes), and avoids the extra indentation and lines of a
call to `concat!`.
For example, rewriting the second example from the [blog post on the new
inline assembly
syntax](https://blog.rust-lang.org/inside-rust/2020/06/08/new-inline-asm.html)
using multiple template strings:
```rust
fn main() {
let mut bits = [0u8; 64];
for value in 0..=1024u64 {
let popcnt;
unsafe {
asm!(
" popcnt {popcnt}, {v}",
"2:",
" blsi rax, {v}",
" jz 1f",
" xor {v}, rax",
" tzcnt rax, rax",
" stosb",
" jmp 2b",
"1:",
v = inout(reg) value => _,
popcnt = out(reg) popcnt,
out("rax") _, // scratch
inout("rdi") bits.as_mut_ptr() => _,
);
}
println!("bits of {}: {:?}", value, &bits[0..popcnt]);
}
}
```
Note that all the template strings must appear before all other
arguments; you cannot, for instance, provide a series of template
strings intermixed with the corresponding operands.
In order to get srcloc mappings right for macros that generate
multi-line string literals, create one line_span for each
line in the string literal, each pointing to the macro.
Make `rustc_parse_format::Parser::curarg` `pub`, so that we can
propagate it from one template string argument to the next.
2020-06-15 06:33:55 +00:00
|
|
|
pub curarg: usize,
|
2018-07-21 23:18:06 +00:00
|
|
|
/// `Some(raw count)` when the string is "raw", used to position spans correctly
|
|
|
|
style: Option<usize>,
|
2018-08-19 13:30:23 +00:00
|
|
|
/// Start and end byte offset of every successfully parsed argument
|
2019-06-04 15:03:43 +00:00
|
|
|
pub arg_places: Vec<InnerSpan>,
|
2018-12-21 06:33:16 +00:00
|
|
|
/// Characters that need to be shifted
|
|
|
|
skips: Vec<usize>,
|
2019-06-04 15:03:43 +00:00
|
|
|
/// Span of the last opening brace seen, used for error reporting
|
|
|
|
last_opening_brace: Option<InnerSpan>,
|
2020-03-06 11:13:55 +00:00
|
|
|
/// Whether the source string is comes from `println!` as opposed to `format!` or `print!`
|
2018-12-21 06:33:16 +00:00
|
|
|
append_newline: bool,
|
2020-02-12 15:47:43 +00:00
|
|
|
/// Whether this formatting string is a literal or it comes from a macro.
|
2019-10-12 14:07:13 +00:00
|
|
|
pub is_literal: bool,
|
2020-05-26 19:07:59 +00:00
|
|
|
/// Start position of the current line.
|
|
|
|
cur_line_start: usize,
|
|
|
|
/// Start and end byte offset of every line of the format string. Excludes
|
|
|
|
/// newline characters and leading whitespace.
|
|
|
|
pub line_spans: Vec<InnerSpan>,
|
2018-12-21 06:33:16 +00:00
|
|
|
}
|
|
|
|
|
2015-01-02 03:36:34 +00:00
|
|
|
impl<'a> Iterator for Parser<'a> {
|
|
|
|
type Item = Piece<'a>;
|
|
|
|
|
2013-12-10 07:16:18 +00:00
|
|
|
fn next(&mut self) -> Option<Piece<'a>> {
|
2015-09-10 13:48:11 +00:00
|
|
|
if let Some(&(pos, c)) = self.cur.peek() {
|
|
|
|
match c {
|
|
|
|
'{' => {
|
2019-06-04 15:03:43 +00:00
|
|
|
let curr_last_brace = self.last_opening_brace;
|
|
|
|
let byte_pos = self.to_span_index(pos);
|
2019-06-07 01:31:24 +00:00
|
|
|
self.last_opening_brace = Some(byte_pos.to(InnerOffset(byte_pos.0 + 1)));
|
2015-09-10 13:48:11 +00:00
|
|
|
self.cur.next();
|
|
|
|
if self.consume('{') {
|
2019-06-04 15:03:43 +00:00
|
|
|
self.last_opening_brace = curr_last_brace;
|
2018-12-21 06:33:16 +00:00
|
|
|
|
2018-07-20 16:15:22 +00:00
|
|
|
Some(String(self.string(pos + 1)))
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
2018-07-29 16:40:36 +00:00
|
|
|
let arg = self.argument();
|
2019-06-04 15:03:43 +00:00
|
|
|
if let Some(end) = self.must_consume('}') {
|
|
|
|
let start = self.to_span_index(pos);
|
|
|
|
let end = self.to_span_index(end + 1);
|
2020-02-12 15:47:43 +00:00
|
|
|
if self.is_literal {
|
|
|
|
self.arg_places.push(start.to(end));
|
|
|
|
}
|
2018-07-23 05:40:24 +00:00
|
|
|
}
|
|
|
|
Some(NextArgument(arg))
|
2015-09-10 13:48:11 +00:00
|
|
|
}
|
2014-05-28 16:24:28 +00:00
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
'}' => {
|
|
|
|
self.cur.next();
|
|
|
|
if self.consume('}') {
|
2018-07-20 16:15:22 +00:00
|
|
|
Some(String(self.string(pos + 1)))
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
2018-12-21 06:33:16 +00:00
|
|
|
let err_pos = self.to_span_index(pos);
|
2018-05-10 16:09:58 +00:00
|
|
|
self.err_with_note(
|
|
|
|
"unmatched `}` found",
|
|
|
|
"unmatched `}`",
|
|
|
|
"if you intended to print `}`, you can escape it using `}}`",
|
2019-06-04 15:03:43 +00:00
|
|
|
err_pos.to(err_pos),
|
2018-05-10 16:09:58 +00:00
|
|
|
);
|
2015-09-10 13:48:11 +00:00
|
|
|
None
|
|
|
|
}
|
2014-05-28 16:24:28 +00:00
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
_ => Some(String(self.string(pos))),
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
asm: Allow multiple template strings; interpret them as newline-separated
Allow the `asm!` macro to accept a series of template arguments, and
interpret them as if they were concatenated with a '\n' between them.
This allows writing an `asm!` where each line of assembly appears in a
separate template string argument.
This syntax makes it possible for rustfmt to reliably format and indent
each line of assembly, without risking changes to the inside of a
template string. It also avoids the complexity of having the user
carefully format and indent a multi-line string (including where to put
the surrounding quotes), and avoids the extra indentation and lines of a
call to `concat!`.
For example, rewriting the second example from the [blog post on the new
inline assembly
syntax](https://blog.rust-lang.org/inside-rust/2020/06/08/new-inline-asm.html)
using multiple template strings:
```rust
fn main() {
let mut bits = [0u8; 64];
for value in 0..=1024u64 {
let popcnt;
unsafe {
asm!(
" popcnt {popcnt}, {v}",
"2:",
" blsi rax, {v}",
" jz 1f",
" xor {v}, rax",
" tzcnt rax, rax",
" stosb",
" jmp 2b",
"1:",
v = inout(reg) value => _,
popcnt = out(reg) popcnt,
out("rax") _, // scratch
inout("rdi") bits.as_mut_ptr() => _,
);
}
println!("bits of {}: {:?}", value, &bits[0..popcnt]);
}
}
```
Note that all the template strings must appear before all other
arguments; you cannot, for instance, provide a series of template
strings intermixed with the corresponding operands.
In order to get srcloc mappings right for macros that generate
multi-line string literals, create one line_span for each
line in the string literal, each pointing to the macro.
Make `rustc_parse_format::Parser::curarg` `pub`, so that we can
propagate it from one template string argument to the next.
2020-06-15 06:33:55 +00:00
|
|
|
if self.is_literal {
|
2020-05-26 19:07:59 +00:00
|
|
|
let start = self.to_span_index(self.cur_line_start);
|
|
|
|
let end = self.to_span_index(self.input.len());
|
asm: Allow multiple template strings; interpret them as newline-separated
Allow the `asm!` macro to accept a series of template arguments, and
interpret them as if they were concatenated with a '\n' between them.
This allows writing an `asm!` where each line of assembly appears in a
separate template string argument.
This syntax makes it possible for rustfmt to reliably format and indent
each line of assembly, without risking changes to the inside of a
template string. It also avoids the complexity of having the user
carefully format and indent a multi-line string (including where to put
the surrounding quotes), and avoids the extra indentation and lines of a
call to `concat!`.
For example, rewriting the second example from the [blog post on the new
inline assembly
syntax](https://blog.rust-lang.org/inside-rust/2020/06/08/new-inline-asm.html)
using multiple template strings:
```rust
fn main() {
let mut bits = [0u8; 64];
for value in 0..=1024u64 {
let popcnt;
unsafe {
asm!(
" popcnt {popcnt}, {v}",
"2:",
" blsi rax, {v}",
" jz 1f",
" xor {v}, rax",
" tzcnt rax, rax",
" stosb",
" jmp 2b",
"1:",
v = inout(reg) value => _,
popcnt = out(reg) popcnt,
out("rax") _, // scratch
inout("rdi") bits.as_mut_ptr() => _,
);
}
println!("bits of {}: {:?}", value, &bits[0..popcnt]);
}
}
```
Note that all the template strings must appear before all other
arguments; you cannot, for instance, provide a series of template
strings intermixed with the corresponding operands.
In order to get srcloc mappings right for macros that generate
multi-line string literals, create one line_span for each
line in the string literal, each pointing to the macro.
Make `rustc_parse_format::Parser::curarg` `pub`, so that we can
propagate it from one template string argument to the next.
2020-06-15 06:33:55 +00:00
|
|
|
let span = start.to(end);
|
|
|
|
if self.line_spans.last() != Some(&span) {
|
|
|
|
self.line_spans.push(span);
|
|
|
|
}
|
2020-05-26 19:07:59 +00:00
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
None
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-10 07:16:18 +00:00
|
|
|
impl<'a> Parser<'a> {
|
2013-07-29 08:12:41 +00:00
|
|
|
/// Creates a new parser for the given format string
|
2018-12-21 06:33:16 +00:00
|
|
|
pub fn new(
|
|
|
|
s: &'a str,
|
|
|
|
style: Option<usize>,
|
2020-02-12 15:47:43 +00:00
|
|
|
snippet: Option<string::String>,
|
2018-12-21 06:33:16 +00:00
|
|
|
append_newline: bool,
|
2020-02-12 15:47:43 +00:00
|
|
|
mode: ParseMode,
|
2018-12-21 06:33:16 +00:00
|
|
|
) -> Parser<'a> {
|
2020-02-12 15:47:43 +00:00
|
|
|
let (skips, is_literal) = find_skips_from_snippet(snippet, style);
|
2013-07-29 08:12:41 +00:00
|
|
|
Parser {
|
2020-02-12 15:47:43 +00:00
|
|
|
mode,
|
2013-07-29 08:12:41 +00:00
|
|
|
input: s,
|
2015-09-10 12:03:22 +00:00
|
|
|
cur: s.char_indices().peekable(),
|
2015-11-23 23:11:20 +00:00
|
|
|
errors: vec![],
|
2016-05-16 06:10:54 +00:00
|
|
|
curarg: 0,
|
2018-07-20 06:14:00 +00:00
|
|
|
style,
|
2018-07-23 05:40:24 +00:00
|
|
|
arg_places: vec![],
|
2018-12-21 06:33:16 +00:00
|
|
|
skips,
|
2019-06-04 15:03:43 +00:00
|
|
|
last_opening_brace: None,
|
2018-12-21 06:33:16 +00:00
|
|
|
append_newline,
|
2020-02-12 15:47:43 +00:00
|
|
|
is_literal,
|
2020-05-26 19:07:59 +00:00
|
|
|
cur_line_start: 0,
|
|
|
|
line_spans: vec![],
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Notifies of an error. The message doesn't actually need to be of type
|
2014-05-22 23:57:53 +00:00
|
|
|
/// String, but I think it does when this eventually uses conditions so it
|
2013-07-29 08:12:41 +00:00
|
|
|
/// might as well start using it now.
|
2018-05-10 16:09:58 +00:00
|
|
|
fn err<S1: Into<string::String>, S2: Into<string::String>>(
|
|
|
|
&mut self,
|
|
|
|
description: S1,
|
|
|
|
label: S2,
|
2019-06-04 15:03:43 +00:00
|
|
|
span: InnerSpan,
|
2018-05-10 16:09:58 +00:00
|
|
|
) {
|
|
|
|
self.errors.push(ParseError {
|
|
|
|
description: description.into(),
|
|
|
|
note: None,
|
|
|
|
label: label.into(),
|
2019-06-04 15:03:43 +00:00
|
|
|
span,
|
2018-12-21 06:33:16 +00:00
|
|
|
secondary_label: None,
|
2018-05-10 16:09:58 +00:00
|
|
|
});
|
2016-11-10 20:48:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Notifies of an error. The message doesn't actually need to be of type
|
|
|
|
/// String, but I think it does when this eventually uses conditions so it
|
|
|
|
/// might as well start using it now.
|
2019-12-22 22:42:04 +00:00
|
|
|
fn err_with_note<
|
|
|
|
S1: Into<string::String>,
|
|
|
|
S2: Into<string::String>,
|
|
|
|
S3: Into<string::String>,
|
|
|
|
>(
|
2018-05-10 16:09:58 +00:00
|
|
|
&mut self,
|
|
|
|
description: S1,
|
|
|
|
label: S2,
|
|
|
|
note: S3,
|
2019-06-04 15:03:43 +00:00
|
|
|
span: InnerSpan,
|
2018-05-10 16:09:58 +00:00
|
|
|
) {
|
|
|
|
self.errors.push(ParseError {
|
|
|
|
description: description.into(),
|
|
|
|
note: Some(note.into()),
|
|
|
|
label: label.into(),
|
2019-06-04 15:03:43 +00:00
|
|
|
span,
|
2018-12-21 06:33:16 +00:00
|
|
|
secondary_label: None,
|
2018-05-10 16:09:58 +00:00
|
|
|
});
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Optionally consumes the specified character. If the character is not at
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
/// the current position, then the current iterator isn't moved and `false` is
|
|
|
|
/// returned, otherwise the character is consumed and `true` is returned.
|
2013-07-29 08:12:41 +00:00
|
|
|
fn consume(&mut self, c: char) -> bool {
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
self.consume_pos(c).is_some()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Optionally consumes the specified character. If the character is not at
|
|
|
|
/// the current position, then the current iterator isn't moved and `None` is
|
|
|
|
/// returned, otherwise the character is consumed and the current position is
|
|
|
|
/// returned.
|
|
|
|
fn consume_pos(&mut self, c: char) -> Option<usize> {
|
|
|
|
if let Some(&(pos, maybe)) = self.cur.peek() {
|
2015-10-13 14:10:51 +00:00
|
|
|
if c == maybe {
|
|
|
|
self.cur.next();
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
return Some(pos);
|
2015-10-13 14:10:51 +00:00
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
None
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
2019-06-04 15:03:43 +00:00
|
|
|
fn to_span_index(&self, pos: usize) -> InnerOffset {
|
2018-12-21 06:33:16 +00:00
|
|
|
let mut pos = pos;
|
2019-06-07 00:38:34 +00:00
|
|
|
// This handles the raw string case, the raw argument is the number of #
|
|
|
|
// in r###"..."### (we need to add one because of the `r`).
|
2019-06-04 14:57:40 +00:00
|
|
|
let raw = self.style.map(|raw| raw + 1).unwrap_or(0);
|
2018-12-21 06:33:16 +00:00
|
|
|
for skip in &self.skips {
|
|
|
|
if pos > *skip {
|
|
|
|
pos += 1;
|
2019-06-04 14:57:40 +00:00
|
|
|
} else if pos == *skip && raw == 0 {
|
2018-12-21 06:33:16 +00:00
|
|
|
pos += 1;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2019-06-04 15:03:43 +00:00
|
|
|
InnerOffset(raw + pos + 1)
|
2018-12-21 06:33:16 +00:00
|
|
|
}
|
|
|
|
|
2013-10-18 17:30:40 +00:00
|
|
|
/// Forces consumption of the specified character. If the character is not
|
|
|
|
/// found, an error is emitted.
|
2018-07-23 05:40:24 +00:00
|
|
|
fn must_consume(&mut self, c: char) -> Option<usize> {
|
2013-10-18 17:30:40 +00:00
|
|
|
self.ws();
|
2018-07-20 16:15:22 +00:00
|
|
|
|
2018-05-10 16:09:58 +00:00
|
|
|
if let Some(&(pos, maybe)) = self.cur.peek() {
|
2015-09-10 13:48:11 +00:00
|
|
|
if c == maybe {
|
2013-10-18 17:30:40 +00:00
|
|
|
self.cur.next();
|
2018-07-23 05:40:24 +00:00
|
|
|
Some(pos)
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
2018-12-21 06:33:16 +00:00
|
|
|
let pos = self.to_span_index(pos);
|
|
|
|
let description = format!("expected `'}}'`, found `{:?}`", maybe);
|
|
|
|
let label = "expected `}`".to_owned();
|
|
|
|
let (note, secondary_label) = if c == '}' {
|
2019-12-22 22:42:04 +00:00
|
|
|
(
|
|
|
|
Some(
|
|
|
|
"if you intended to print `{`, you can escape it using `{{`".to_owned(),
|
|
|
|
),
|
|
|
|
self.last_opening_brace
|
|
|
|
.map(|sp| ("because of this opening brace".to_owned(), sp)),
|
|
|
|
)
|
2018-12-21 06:33:16 +00:00
|
|
|
} else {
|
|
|
|
(None, None)
|
|
|
|
};
|
|
|
|
self.errors.push(ParseError {
|
|
|
|
description,
|
|
|
|
note,
|
|
|
|
label,
|
2019-06-04 15:03:43 +00:00
|
|
|
span: pos.to(pos),
|
2018-12-21 06:33:16 +00:00
|
|
|
secondary_label,
|
|
|
|
});
|
2018-07-23 05:40:24 +00:00
|
|
|
None
|
2013-10-18 17:30:40 +00:00
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
2018-12-21 06:33:16 +00:00
|
|
|
let description = format!("expected `{:?}` but string was terminated", c);
|
|
|
|
// point at closing `"`
|
|
|
|
let pos = self.input.len() - if self.append_newline { 1 } else { 0 };
|
|
|
|
let pos = self.to_span_index(pos);
|
2016-11-10 20:48:55 +00:00
|
|
|
if c == '}' {
|
2018-12-21 06:33:16 +00:00
|
|
|
let label = format!("expected `{:?}`", c);
|
|
|
|
let (note, secondary_label) = if c == '}' {
|
2019-12-22 22:42:04 +00:00
|
|
|
(
|
|
|
|
Some(
|
|
|
|
"if you intended to print `{`, you can escape it using `{{`".to_owned(),
|
|
|
|
),
|
|
|
|
self.last_opening_brace
|
|
|
|
.map(|sp| ("because of this opening brace".to_owned(), sp)),
|
|
|
|
)
|
2018-12-21 06:33:16 +00:00
|
|
|
} else {
|
|
|
|
(None, None)
|
|
|
|
};
|
|
|
|
self.errors.push(ParseError {
|
|
|
|
description,
|
|
|
|
note,
|
|
|
|
label,
|
2019-06-04 15:03:43 +00:00
|
|
|
span: pos.to(pos),
|
2018-12-21 06:33:16 +00:00
|
|
|
secondary_label,
|
|
|
|
});
|
2016-11-10 20:48:55 +00:00
|
|
|
} else {
|
2019-06-04 15:03:43 +00:00
|
|
|
self.err(description, format!("expected `{:?}`", c), pos.to(pos));
|
2016-11-10 20:48:55 +00:00
|
|
|
}
|
2018-07-23 05:40:24 +00:00
|
|
|
None
|
2013-10-18 17:30:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-21 06:33:16 +00:00
|
|
|
/// Consumes all whitespace characters until the first non-whitespace character
|
2013-07-29 08:12:41 +00:00
|
|
|
fn ws(&mut self) {
|
2015-09-10 13:48:11 +00:00
|
|
|
while let Some(&(_, c)) = self.cur.peek() {
|
2015-10-13 14:10:51 +00:00
|
|
|
if c.is_whitespace() {
|
|
|
|
self.cur.next();
|
|
|
|
} else {
|
2015-11-23 23:11:20 +00:00
|
|
|
break;
|
2015-10-13 14:10:51 +00:00
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parses all of a string which is to be considered a "raw literal" in a
|
|
|
|
/// format string. This is everything outside of the braces.
|
2015-02-23 03:07:38 +00:00
|
|
|
fn string(&mut self, start: usize) -> &'a str {
|
2015-09-10 13:48:11 +00:00
|
|
|
// we may not consume the character, peek the iterator
|
|
|
|
while let Some(&(pos, c)) = self.cur.peek() {
|
|
|
|
match c {
|
2015-10-13 14:10:51 +00:00
|
|
|
'{' | '}' => {
|
|
|
|
return &self.input[start..pos];
|
|
|
|
}
|
2020-05-26 19:07:59 +00:00
|
|
|
'\n' if self.is_literal => {
|
|
|
|
let start = self.to_span_index(self.cur_line_start);
|
|
|
|
let end = self.to_span_index(pos);
|
|
|
|
self.line_spans.push(start.to(end));
|
|
|
|
self.cur_line_start = pos + 1;
|
|
|
|
self.cur.next();
|
|
|
|
}
|
2015-10-13 14:10:51 +00:00
|
|
|
_ => {
|
2020-05-26 19:07:59 +00:00
|
|
|
if self.is_literal && pos == self.cur_line_start && c.is_whitespace() {
|
|
|
|
self.cur_line_start = pos + c.len_utf8();
|
|
|
|
}
|
2015-10-13 14:10:51 +00:00
|
|
|
self.cur.next();
|
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
&self.input[start..self.input.len()]
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
2019-09-30 00:08:15 +00:00
|
|
|
/// Parses an `Argument` structure, or what's contained within braces inside the format string.
|
2013-12-10 07:16:18 +00:00
|
|
|
fn argument(&mut self) -> Argument<'a> {
|
2016-05-16 17:02:42 +00:00
|
|
|
let pos = self.position();
|
2020-02-12 15:47:43 +00:00
|
|
|
let format = match self.mode {
|
|
|
|
ParseMode::Format => self.format(),
|
|
|
|
ParseMode::InlineAsm => self.inline_asm(),
|
|
|
|
};
|
2016-05-16 06:10:54 +00:00
|
|
|
|
2016-05-16 17:02:42 +00:00
|
|
|
// Resolve position after parsing format spec.
|
|
|
|
let pos = match pos {
|
|
|
|
Some(position) => position,
|
|
|
|
None => {
|
2016-05-16 06:10:54 +00:00
|
|
|
let i = self.curarg;
|
|
|
|
self.curarg += 1;
|
2017-11-09 17:16:25 +00:00
|
|
|
ArgumentImplicitlyIs(i)
|
2016-05-16 06:10:54 +00:00
|
|
|
}
|
2016-05-16 17:02:42 +00:00
|
|
|
};
|
2016-05-16 06:10:54 +00:00
|
|
|
|
2019-12-22 22:42:04 +00:00
|
|
|
Argument { position: pos, format }
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Parses a positional argument for a format. This could either be an
|
|
|
|
/// integer index of an argument, a named argument, or a blank string.
|
2016-05-16 17:02:42 +00:00
|
|
|
/// Returns `Some(parsed_position)` if the position is not implicitly
|
|
|
|
/// consuming a macro argument, `None` if it's the case.
|
2019-06-04 02:47:42 +00:00
|
|
|
fn position(&mut self) -> Option<Position> {
|
2015-09-10 13:48:11 +00:00
|
|
|
if let Some(i) = self.integer() {
|
2016-05-16 17:02:42 +00:00
|
|
|
Some(ArgumentIs(i))
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
|
|
|
match self.cur.peek() {
|
2019-11-28 18:49:13 +00:00
|
|
|
Some(&(_, c)) if rustc_lexer::is_id_start(c) => {
|
2019-06-04 02:47:42 +00:00
|
|
|
Some(ArgumentNamed(Symbol::intern(self.word())))
|
|
|
|
}
|
2016-05-16 17:02:42 +00:00
|
|
|
|
|
|
|
// This is an `ArgumentNext`.
|
|
|
|
// Record the fact and do the resolution after parsing the
|
|
|
|
// format spec, to make things like `{:.*}` work.
|
|
|
|
_ => None,
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Parses a format specifier at the current position, returning all of the
|
2019-09-30 00:08:15 +00:00
|
|
|
/// relevant information in the `FormatSpec` struct.
|
2013-12-10 07:16:18 +00:00
|
|
|
fn format(&mut self) -> FormatSpec<'a> {
|
2013-07-29 08:12:41 +00:00
|
|
|
let mut spec = FormatSpec {
|
|
|
|
fill: None,
|
2013-08-10 23:50:42 +00:00
|
|
|
align: AlignUnknown,
|
2013-07-29 08:12:41 +00:00
|
|
|
flags: 0,
|
|
|
|
precision: CountImplied,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
precision_span: None,
|
2013-07-29 08:12:41 +00:00
|
|
|
width: CountImplied,
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
width_span: None,
|
2015-01-12 21:59:18 +00:00
|
|
|
ty: &self.input[..0],
|
Point at formatting descriptor string when it is invalid
When a formatting string contains an invalid descriptor, point at it
instead of the argument:
```
error: unknown format trait `foo`
--> $DIR/ifmt-bad-arg.rs:86:17
|
LL | println!("{:foo}", 1);
| ^^^
|
= note: the only appropriate formatting traits are:
- ``, which uses the `Display` trait
- `?`, which uses the `Debug` trait
- `e`, which uses the `LowerExp` trait
- `E`, which uses the `UpperExp` trait
- `o`, which uses the `Octal` trait
- `p`, which uses the `Pointer` trait
- `b`, which uses the `Binary` trait
- `x`, which uses the `LowerHex` trait
- `X`, which uses the `UpperHex` trait
```
2019-11-05 19:55:00 +00:00
|
|
|
ty_span: None,
|
2013-07-29 08:12:41 +00:00
|
|
|
};
|
2015-10-13 14:10:51 +00:00
|
|
|
if !self.consume(':') {
|
2015-11-23 23:11:20 +00:00
|
|
|
return spec;
|
2015-10-13 14:10:51 +00:00
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
|
|
|
|
// fill character
|
2015-09-10 13:48:11 +00:00
|
|
|
if let Some(&(_, c)) = self.cur.peek() {
|
2020-09-18 16:33:37 +00:00
|
|
|
if let Some((_, '>' | '<' | '^')) = self.cur.clone().nth(1) {
|
|
|
|
spec.fill = Some(c);
|
|
|
|
self.cur.next();
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// Alignment
|
|
|
|
if self.consume('<') {
|
2013-08-10 23:50:42 +00:00
|
|
|
spec.align = AlignLeft;
|
2013-07-29 08:12:41 +00:00
|
|
|
} else if self.consume('>') {
|
2013-08-10 23:50:42 +00:00
|
|
|
spec.align = AlignRight;
|
2014-08-30 18:27:02 +00:00
|
|
|
} else if self.consume('^') {
|
|
|
|
spec.align = AlignCenter;
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
// Sign flags
|
|
|
|
if self.consume('+') {
|
2015-02-23 03:07:38 +00:00
|
|
|
spec.flags |= 1 << (FlagSignPlus as u32);
|
2013-07-29 08:12:41 +00:00
|
|
|
} else if self.consume('-') {
|
2015-02-23 03:07:38 +00:00
|
|
|
spec.flags |= 1 << (FlagSignMinus as u32);
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
// Alternate marker
|
|
|
|
if self.consume('#') {
|
2015-02-23 03:07:38 +00:00
|
|
|
spec.flags |= 1 << (FlagAlternate as u32);
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
// Width and precision
|
2013-10-13 03:00:58 +00:00
|
|
|
let mut havewidth = false;
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
|
2013-08-10 23:50:42 +00:00
|
|
|
if self.consume('0') {
|
2013-10-13 03:00:58 +00:00
|
|
|
// small ambiguity with '0$' as a format string. In theory this is a
|
|
|
|
// '0' flag and then an ill-formatted format string with just a '$'
|
|
|
|
// and no count, but this is better if we instead interpret this as
|
|
|
|
// no '0' flag and '0$' as the width instead.
|
|
|
|
if self.consume('$') {
|
|
|
|
spec.width = CountIsParam(0);
|
|
|
|
havewidth = true;
|
|
|
|
} else {
|
2015-02-23 03:07:38 +00:00
|
|
|
spec.flags |= 1 << (FlagSignAwareZeroPad as u32);
|
2013-10-13 03:00:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if !havewidth {
|
2019-12-22 22:42:04 +00:00
|
|
|
let width_span_start = if let Some((pos, _)) = self.cur.peek() { *pos } else { 0 };
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
let (w, sp) = self.count(width_span_start);
|
|
|
|
spec.width = w;
|
|
|
|
spec.width_span = sp;
|
2013-08-10 23:50:42 +00:00
|
|
|
}
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
if let Some(start) = self.consume_pos('.') {
|
|
|
|
if let Some(end) = self.consume_pos('*') {
|
2016-05-16 17:02:42 +00:00
|
|
|
// Resolve `CountIsNextParam`.
|
|
|
|
// We can do this immediately as `position` is resolved later.
|
|
|
|
let i = self.curarg;
|
|
|
|
self.curarg += 1;
|
|
|
|
spec.precision = CountIsParam(i);
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
spec.precision_span =
|
|
|
|
Some(self.to_span_index(start).to(self.to_span_index(end + 1)));
|
2013-07-29 08:12:41 +00:00
|
|
|
} else {
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
let (p, sp) = self.count(start);
|
|
|
|
spec.precision = p;
|
|
|
|
spec.precision_span = sp;
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
Point at formatting descriptor string when it is invalid
When a formatting string contains an invalid descriptor, point at it
instead of the argument:
```
error: unknown format trait `foo`
--> $DIR/ifmt-bad-arg.rs:86:17
|
LL | println!("{:foo}", 1);
| ^^^
|
= note: the only appropriate formatting traits are:
- ``, which uses the `Display` trait
- `?`, which uses the `Debug` trait
- `e`, which uses the `LowerExp` trait
- `E`, which uses the `UpperExp` trait
- `o`, which uses the `Octal` trait
- `p`, which uses the `Pointer` trait
- `b`, which uses the `Binary` trait
- `x`, which uses the `LowerHex` trait
- `X`, which uses the `UpperHex` trait
```
2019-11-05 19:55:00 +00:00
|
|
|
let ty_span_start = self.cur.peek().map(|(pos, _)| *pos);
|
2018-03-13 13:08:15 +00:00
|
|
|
// Optional radix followed by the actual format specifier
|
|
|
|
if self.consume('x') {
|
|
|
|
if self.consume('?') {
|
|
|
|
spec.flags |= 1 << (FlagDebugLowerHex as u32);
|
|
|
|
spec.ty = "?";
|
|
|
|
} else {
|
|
|
|
spec.ty = "x";
|
|
|
|
}
|
|
|
|
} else if self.consume('X') {
|
|
|
|
if self.consume('?') {
|
|
|
|
spec.flags |= 1 << (FlagDebugUpperHex as u32);
|
|
|
|
spec.ty = "?";
|
|
|
|
} else {
|
|
|
|
spec.ty = "X";
|
|
|
|
}
|
|
|
|
} else if self.consume('?') {
|
2013-08-15 03:40:15 +00:00
|
|
|
spec.ty = "?";
|
|
|
|
} else {
|
|
|
|
spec.ty = self.word();
|
Point at formatting descriptor string when it is invalid
When a formatting string contains an invalid descriptor, point at it
instead of the argument:
```
error: unknown format trait `foo`
--> $DIR/ifmt-bad-arg.rs:86:17
|
LL | println!("{:foo}", 1);
| ^^^
|
= note: the only appropriate formatting traits are:
- ``, which uses the `Display` trait
- `?`, which uses the `Debug` trait
- `e`, which uses the `LowerExp` trait
- `E`, which uses the `UpperExp` trait
- `o`, which uses the `Octal` trait
- `p`, which uses the `Pointer` trait
- `b`, which uses the `Binary` trait
- `x`, which uses the `LowerHex` trait
- `X`, which uses the `UpperHex` trait
```
2019-11-05 19:55:00 +00:00
|
|
|
let ty_span_end = self.cur.peek().map(|(pos, _)| *pos);
|
2019-11-06 00:02:12 +00:00
|
|
|
if !spec.ty.is_empty() {
|
|
|
|
spec.ty_span = ty_span_start
|
|
|
|
.and_then(|s| ty_span_end.map(|e| (s, e)))
|
|
|
|
.map(|(start, end)| self.to_span_index(start).to(self.to_span_index(end)));
|
|
|
|
}
|
2013-08-15 03:40:15 +00:00
|
|
|
}
|
2015-09-02 10:13:10 +00:00
|
|
|
spec
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
2020-02-12 15:47:43 +00:00
|
|
|
/// Parses an inline assembly template modifier at the current position, returning the modifier
|
|
|
|
/// in the `ty` field of the `FormatSpec` struct.
|
|
|
|
fn inline_asm(&mut self) -> FormatSpec<'a> {
|
|
|
|
let mut spec = FormatSpec {
|
|
|
|
fill: None,
|
|
|
|
align: AlignUnknown,
|
|
|
|
flags: 0,
|
|
|
|
precision: CountImplied,
|
|
|
|
precision_span: None,
|
|
|
|
width: CountImplied,
|
|
|
|
width_span: None,
|
|
|
|
ty: &self.input[..0],
|
|
|
|
ty_span: None,
|
|
|
|
};
|
|
|
|
if !self.consume(':') {
|
|
|
|
return spec;
|
|
|
|
}
|
|
|
|
|
|
|
|
let ty_span_start = self.cur.peek().map(|(pos, _)| *pos);
|
|
|
|
spec.ty = self.word();
|
|
|
|
let ty_span_end = self.cur.peek().map(|(pos, _)| *pos);
|
|
|
|
if !spec.ty.is_empty() {
|
|
|
|
spec.ty_span = ty_span_start
|
|
|
|
.and_then(|s| ty_span_end.map(|e| (s, e)))
|
|
|
|
.map(|(start, end)| self.to_span_index(start).to(self.to_span_index(end)));
|
|
|
|
}
|
|
|
|
|
|
|
|
spec
|
|
|
|
}
|
|
|
|
|
2019-09-30 00:08:15 +00:00
|
|
|
/// Parses a `Count` parameter at the current position. This does not check
|
2013-07-29 08:12:41 +00:00
|
|
|
/// for 'CountIsNextParam' because that is only used in precision, not
|
|
|
|
/// width.
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
fn count(&mut self, start: usize) -> (Count, Option<InnerSpan>) {
|
2015-09-10 13:48:11 +00:00
|
|
|
if let Some(i) = self.integer() {
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
if let Some(end) = self.consume_pos('$') {
|
|
|
|
let span = self.to_span_index(start).to(self.to_span_index(end + 1));
|
|
|
|
(CountIsParam(i), Some(span))
|
2015-10-13 14:10:51 +00:00
|
|
|
} else {
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
(CountIs(i), None)
|
2015-10-13 14:10:51 +00:00
|
|
|
}
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
|
|
|
let tmp = self.cur.clone();
|
|
|
|
let word = self.word();
|
|
|
|
if word.is_empty() {
|
|
|
|
self.cur = tmp;
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
(CountImplied, None)
|
2018-08-10 11:13:50 +00:00
|
|
|
} else if self.consume('$') {
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
(CountIsName(Symbol::intern(word)), None)
|
2015-09-10 13:48:11 +00:00
|
|
|
} else {
|
2018-08-10 11:13:50 +00:00
|
|
|
self.cur = tmp;
|
On `format!()` arg count mismatch provide extra info
When positional width and precision formatting flags are present in a
formatting string that has an argument count mismatch, provide extra
information pointing at them making it easiser to understand where the
problem may lay:
```
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:78:15
|
LL | println!("{} {:.*} {}", 1, 3.2, 4);
| ^^ ^^--^ ^^ --- this parameter corresponds to the precision flag
| |
| this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 4 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:81:15
|
LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
| ^^ ^^-----^ ^^ --- this parameter corresponds to the precision flag
| | |
| | this precision flag adds an extra required argument at position 1, which is why there are 4 arguments expected
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
error: 3 positional arguments in format string, but there are 3 arguments
--> $DIR/ifmt-bad-arg.rs:84:15
|
LL | println!("{} {:07$} {}", 1, 3.2, 4);
| ^^ ^^---^ ^^
| |
| this width flag expects an `usize` argument at position 7, but there are 3 arguments
|
= note: positional arguments are zero-based
= note: for information about formatting flags, visit https://doc.rust-lang.org/std/fmt/index.html
```
2019-07-30 01:19:21 +00:00
|
|
|
(CountImplied, None)
|
2013-10-13 03:00:58 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
|
2019-07-21 11:50:39 +00:00
|
|
|
/// Parses a word starting at the current position. A word is the same as
|
|
|
|
/// Rust identifier, except that it can't start with `_` character.
|
2013-12-10 07:16:18 +00:00
|
|
|
fn word(&mut self) -> &'a str {
|
2015-09-10 12:03:22 +00:00
|
|
|
let start = match self.cur.peek() {
|
2019-11-28 18:49:13 +00:00
|
|
|
Some(&(pos, c)) if rustc_lexer::is_id_start(c) => {
|
2015-10-13 14:10:51 +00:00
|
|
|
self.cur.next();
|
|
|
|
pos
|
|
|
|
}
|
|
|
|
_ => {
|
2019-11-28 18:49:13 +00:00
|
|
|
return "";
|
2015-10-13 14:10:51 +00:00
|
|
|
}
|
2013-07-29 08:12:41 +00:00
|
|
|
};
|
2019-11-28 18:49:13 +00:00
|
|
|
let mut end = None;
|
2015-09-10 13:48:11 +00:00
|
|
|
while let Some(&(pos, c)) = self.cur.peek() {
|
2019-09-04 10:16:36 +00:00
|
|
|
if rustc_lexer::is_id_continue(c) {
|
2015-09-10 13:48:11 +00:00
|
|
|
self.cur.next();
|
|
|
|
} else {
|
2019-11-28 18:49:13 +00:00
|
|
|
end = Some(pos);
|
|
|
|
break;
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
2019-11-28 18:49:13 +00:00
|
|
|
let end = end.unwrap_or(self.input.len());
|
|
|
|
let word = &self.input[start..end];
|
|
|
|
if word == "_" {
|
|
|
|
self.err_with_note(
|
|
|
|
"invalid argument name `_`",
|
|
|
|
"invalid argument name",
|
|
|
|
"argument name cannot be a single underscore",
|
|
|
|
self.to_span_index(start).to(self.to_span_index(end)),
|
|
|
|
);
|
|
|
|
}
|
|
|
|
word
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Optionally parses an integer at the current position. This doesn't deal
|
|
|
|
/// with overflow at all, it's just accumulating digits.
|
2015-02-23 03:07:38 +00:00
|
|
|
fn integer(&mut self) -> Option<usize> {
|
2013-07-29 08:12:41 +00:00
|
|
|
let mut cur = 0;
|
|
|
|
let mut found = false;
|
2015-09-10 12:03:22 +00:00
|
|
|
while let Some(&(_, c)) = self.cur.peek() {
|
2015-09-02 10:13:10 +00:00
|
|
|
if let Some(i) = c.to_digit(10) {
|
|
|
|
cur = cur * 10 + i as usize;
|
|
|
|
found = true;
|
|
|
|
self.cur.next();
|
|
|
|
} else {
|
2015-11-23 23:11:20 +00:00
|
|
|
break;
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
2019-12-06 12:18:32 +00:00
|
|
|
found.then_some(cur)
|
2013-07-29 08:12:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-12 15:47:43 +00:00
|
|
|
/// Finds the indices of all characters that have been processed and differ between the actual
|
|
|
|
/// written code (code snippet) and the `InternedString` that gets processed in the `Parser`
|
|
|
|
/// in order to properly synthethise the intra-string `Span`s for error diagnostics.
|
|
|
|
fn find_skips_from_snippet(
|
|
|
|
snippet: Option<string::String>,
|
|
|
|
str_style: Option<usize>,
|
|
|
|
) -> (Vec<usize>, bool) {
|
|
|
|
let snippet = match snippet {
|
|
|
|
Some(ref s) if s.starts_with('"') || s.starts_with("r#") => s,
|
|
|
|
_ => return (vec![], false),
|
|
|
|
};
|
|
|
|
|
|
|
|
fn find_skips(snippet: &str, is_raw: bool) -> Vec<usize> {
|
|
|
|
let mut eat_ws = false;
|
|
|
|
let mut s = snippet.chars().enumerate().peekable();
|
|
|
|
let mut skips = vec![];
|
|
|
|
while let Some((pos, c)) = s.next() {
|
|
|
|
match (c, s.peek()) {
|
|
|
|
// skip whitespace and empty lines ending in '\\'
|
|
|
|
('\\', Some((next_pos, '\n'))) if !is_raw => {
|
|
|
|
eat_ws = true;
|
|
|
|
skips.push(pos);
|
|
|
|
skips.push(*next_pos);
|
|
|
|
let _ = s.next();
|
|
|
|
}
|
|
|
|
('\\', Some((next_pos, '\n' | 'n' | 't'))) if eat_ws => {
|
|
|
|
skips.push(pos);
|
|
|
|
skips.push(*next_pos);
|
|
|
|
let _ = s.next();
|
|
|
|
}
|
|
|
|
(' ' | '\n' | '\t', _) if eat_ws => {
|
|
|
|
skips.push(pos);
|
|
|
|
}
|
2020-08-27 02:18:38 +00:00
|
|
|
('\\', Some((next_pos, 'n' | 't' | 'r' | '0' | '\\' | '\'' | '\"'))) => {
|
2020-02-12 15:47:43 +00:00
|
|
|
skips.push(*next_pos);
|
|
|
|
let _ = s.next();
|
|
|
|
}
|
|
|
|
('\\', Some((_, 'x'))) if !is_raw => {
|
|
|
|
for _ in 0..3 {
|
|
|
|
// consume `\xAB` literal
|
|
|
|
if let Some((pos, _)) = s.next() {
|
|
|
|
skips.push(pos);
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
('\\', Some((_, 'u'))) if !is_raw => {
|
|
|
|
if let Some((pos, _)) = s.next() {
|
|
|
|
skips.push(pos);
|
|
|
|
}
|
|
|
|
if let Some((next_pos, next_c)) = s.next() {
|
|
|
|
if next_c == '{' {
|
|
|
|
skips.push(next_pos);
|
|
|
|
let mut i = 0; // consume up to 6 hexanumeric chars + closing `}`
|
|
|
|
while let (Some((next_pos, c)), true) = (s.next(), i < 7) {
|
|
|
|
if c.is_digit(16) {
|
|
|
|
skips.push(next_pos);
|
|
|
|
} else if c == '}' {
|
|
|
|
skips.push(next_pos);
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
} else if next_c.is_digit(16) {
|
|
|
|
skips.push(next_pos);
|
|
|
|
// We suggest adding `{` and `}` when appropriate, accept it here as if
|
|
|
|
// it were correct
|
|
|
|
let mut i = 0; // consume up to 6 hexanumeric chars
|
|
|
|
while let (Some((next_pos, c)), _) = (s.next(), i < 6) {
|
|
|
|
if c.is_digit(16) {
|
|
|
|
skips.push(next_pos);
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
i += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ if eat_ws => {
|
|
|
|
// `take_while(|c| c.is_whitespace())`
|
|
|
|
eat_ws = false;
|
|
|
|
}
|
|
|
|
_ => {}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
skips
|
|
|
|
}
|
|
|
|
|
|
|
|
let r_start = str_style.map(|r| r + 1).unwrap_or(0);
|
2020-08-01 15:46:59 +00:00
|
|
|
let r_end = str_style.unwrap_or(0);
|
2020-02-12 15:47:43 +00:00
|
|
|
let s = &snippet[r_start + 1..snippet.len() - r_end - 1];
|
|
|
|
(find_skips(s, str_style.is_some()), true)
|
|
|
|
}
|
|
|
|
|
2013-07-29 08:12:41 +00:00
|
|
|
#[cfg(test)]
|
2019-06-15 19:54:46 +00:00
|
|
|
mod tests;
|