diff options
| author | bors <bors@rust-lang.org> | 2014-02-23 03:36:56 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-23 03:36:56 -0800 |
| commit | 8786405047cadcfb5ec3a2d711ca264d74843c13 (patch) | |
| tree | 41f9c244921aa3a5fe2c2a71cad94bea26b99553 /src/libstd | |
| parent | 551da0615764853153db944063ae2e271414a71b (diff) | |
| parent | ad9e26dab3ae8f5d739e89167338bc97b99905b7 (diff) | |
| download | rust-8786405047cadcfb5ec3a2d711ca264d74843c13.tar.gz rust-8786405047cadcfb5ec3a2d711ca264d74843c13.zip | |
auto merge of #12416 : alexcrichton/rust/highlight, r=huonw
This adds simple syntax highlighting based off libsyntax's lexer to be sure to stay up to date with rust's grammar. Some of the highlighting is a bit ad-hoc, but it definitely seems to get the job done! This currently doesn't highlight rustdoc-rendered function signatures and structs that are emitted to each page because the colors already signify what's clickable and I think we'd have to figure out a different scheme before colorizing them. This does, however, colorize all code examples and source code. Closes #11393
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fmt/mod.rs | 24 | ||||
| -rw-r--r-- | src/libstd/num/mod.rs | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 38fae798d5d..f7c1986fca6 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -82,7 +82,7 @@ function, but the `format!` macro is a syntax extension which allows it to leverage named parameters. Named parameters are listed at the end of the argument list and have the syntax: -```ignore +```notrust identifier '=' expression ``` @@ -107,7 +107,7 @@ and if all references to one argument do not provide a type, then the format `?` is used (the type's rust-representation is printed). For example, this is an invalid format string: -```ignore +```notrust {0:d} {0:s} ``` @@ -123,7 +123,7 @@ must have the type `uint`. Although a `uint` can be printed with `{:u}`, it is illegal to reference an argument as such. For example, this is another invalid format string: -```ignore +```notrust {:.*s} {0:u} ``` @@ -232,7 +232,7 @@ fn main() { There are a number of related macros in the `format!` family. The ones that are currently implemented are: -```rust,ignore +```ignore format! // described above write! // first argument is a &mut io::Writer, the destination writeln! // same as write but appends a newline @@ -276,7 +276,7 @@ references information on the stack. Under the hood, all of the related macros are implemented in terms of this. First off, some example usage is: -```rust,ignore +```ignore use std::fmt; # fn lol<T>() -> T { fail!() } @@ -334,7 +334,7 @@ This example is the equivalent of `{0:s}` essentially. The select method is a switch over a `&str` parameter, and the parameter *must* be of the type `&str`. An example of the syntax is: -```ignore +```notrust {0, select, male{...} female{...} other{...}} ``` @@ -353,7 +353,7 @@ The plural method is a switch statement over a `uint` parameter, and the parameter *must* be a `uint`. A plural method in its full glory can be specified as: -```ignore +```notrust {0, plural, offset=1 =1{...} two{...} many{...} other{...}} ``` @@ -381,7 +381,7 @@ should not be too alien. Arguments are formatted with python-like syntax, meaning that arguments are surrounded by `{}` instead of the C-like `%`. The actual grammar for the formatting syntax is: -```ignore +```notrust format_string := <text> [ format <text> ] * format := '{' [ argument ] [ ':' format_spec ] [ ',' function_spec ] '}' argument := integer | identifier @@ -896,10 +896,10 @@ impl<'a> Formatter<'a> { /// /// # Arguments /// - /// * is_positive - whether the original integer was positive or not. - /// * prefix - if the '#' character (FlagAlternate) is provided, this - /// is the prefix to put in front of the number. - /// * buf - the byte array that the number has been formatted into + /// * is_positive - whether the original integer was positive or not. + /// * prefix - if the '#' character (FlagAlternate) is provided, this + /// is the prefix to put in front of the number. + /// * buf - the byte array that the number has been formatted into /// /// This function will correctly account for the flags provided as well as /// the minimum width. It will not take precision into account. diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index b23e42ad1c6..104543d4323 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -53,7 +53,7 @@ pub trait Zero: Add<Self, Self> { /// /// # Laws /// - /// ~~~ignore + /// ~~~notrust /// a + 0 = a ∀ a ∈ Self /// 0 + a = a ∀ a ∈ Self /// ~~~ @@ -79,7 +79,7 @@ pub trait One: Mul<Self, Self> { /// /// # Laws /// - /// ~~~ignore + /// ~~~notrust /// a * 1 = a ∀ a ∈ Self /// 1 * a = a ∀ a ∈ Self /// ~~~ |
