|
326 | 326 | //! sign := '+' | '-' |
327 | 327 | //! width := count |
328 | 328 | //! precision := count | '*' |
329 | | -//! type := identifier | '' |
| 329 | +//! type := identifier | '?' | '' |
330 | 330 | //! count := parameter | integer |
331 | 331 | //! parameter := argument '$' |
332 | 332 | //! ``` |
@@ -516,17 +516,17 @@ pub use core::fmt::rt; |
516 | 516 | #[stable(feature = "rust1", since = "1.0.0")] |
517 | 517 | pub use core::fmt::{Formatter, Result, Write}; |
518 | 518 | #[stable(feature = "rust1", since = "1.0.0")] |
519 | | -pub use core::fmt::{Octal, Binary}; |
| 519 | +pub use core::fmt::{Binary, Octal}; |
520 | 520 | #[stable(feature = "rust1", since = "1.0.0")] |
521 | | -pub use core::fmt::{Display, Debug}; |
| 521 | +pub use core::fmt::{Debug, Display}; |
522 | 522 | #[stable(feature = "rust1", since = "1.0.0")] |
523 | | -pub use core::fmt::{LowerHex, UpperHex, Pointer}; |
| 523 | +pub use core::fmt::{LowerHex, Pointer, UpperHex}; |
524 | 524 | #[stable(feature = "rust1", since = "1.0.0")] |
525 | 525 | pub use core::fmt::{LowerExp, UpperExp}; |
526 | 526 | #[stable(feature = "rust1", since = "1.0.0")] |
527 | 527 | pub use core::fmt::Error; |
528 | 528 | #[stable(feature = "rust1", since = "1.0.0")] |
529 | | -pub use core::fmt::{ArgumentV1, Arguments, write}; |
| 529 | +pub use core::fmt::{write, ArgumentV1, Arguments}; |
530 | 530 | #[stable(feature = "rust1", since = "1.0.0")] |
531 | 531 | pub use core::fmt::{DebugList, DebugMap, DebugSet, DebugStruct, DebugTuple}; |
532 | 532 |
|
@@ -563,7 +563,8 @@ use string; |
563 | 563 | pub fn format(args: Arguments) -> string::String { |
564 | 564 | let capacity = args.estimated_capacity(); |
565 | 565 | let mut output = string::String::with_capacity(capacity); |
566 | | - output.write_fmt(args) |
567 | | - .expect("a formatting trait implementation returned an error"); |
| 566 | + output |
| 567 | + .write_fmt(args) |
| 568 | + .expect("a formatting trait implementation returned an error"); |
568 | 569 | output |
569 | 570 | } |
0 commit comments