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