diff options
| author | bors <bors@rust-lang.org> | 2014-06-02 17:16:31 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-02 17:16:31 -0700 |
| commit | 63e9b8f105ba0fe18e99cb280a23db82380960f4 (patch) | |
| tree | ee65b10c16ef7181ba34f0653cae3b3672734cf7 /src/libsyntax | |
| parent | 455f574470a3a3f755522bc0fb6594ec10eeda40 (diff) | |
| parent | 20fb7c62d433addf853b8ab824462fca536aba07 (diff) | |
| download | rust-63e9b8f105ba0fe18e99cb280a23db82380960f4.tar.gz rust-63e9b8f105ba0fe18e99cb280a23db82380960f4.zip | |
auto merge of #14601 : skade/rust/remove-notrust-tags, r=alexcrichton
Now that rustdoc understands proper language tags as the code not being Rust, we can tag everything properly. `norust` as a negative statement is a bad tag. This change tags examples in other languages by their language. Plain notations are marked as `text`. Console examples are marked as `console`. Also fix markdown.rs to not highlight non-rust code. Amends the documentation to reflect the new behaviour.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/deriving/generic/mod.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index eb224d255e5..228f5f02bee 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -102,7 +102,7 @@ above `PartialEq`, `A`, `B` and `C`. When generating the `expr` for the `A` impl, the `SubstructureFields` is -~~~notrust +~~~text Struct(~[FieldInfo { span: <span of x> name: Some(<ident of x>), @@ -113,7 +113,7 @@ Struct(~[FieldInfo { For the `B` impl, called with `B(a)` and `B(b)`, -~~~notrust +~~~text Struct(~[FieldInfo { span: <span of `int`>, name: None, @@ -127,7 +127,7 @@ Struct(~[FieldInfo { When generating the `expr` for a call with `self == C0(a)` and `other == C0(b)`, the SubstructureFields is -~~~notrust +~~~text EnumMatching(0, <ast::Variant for C0>, ~[FieldInfo { span: <span of int> @@ -139,7 +139,7 @@ EnumMatching(0, <ast::Variant for C0>, For `C1 {x}` and `C1 {x}`, -~~~notrust +~~~text EnumMatching(1, <ast::Variant for C1>, ~[FieldInfo { span: <span of x> @@ -151,7 +151,7 @@ EnumMatching(1, <ast::Variant for C1>, For `C0(a)` and `C1 {x}` , -~~~notrust +~~~text EnumNonMatching(~[(0, <ast::Variant for B0>, ~[(<span of int>, None, <expr for &a>)]), (1, <ast::Variant for B1>, @@ -165,7 +165,7 @@ EnumNonMatching(~[(0, <ast::Variant for B0>, A static method on the above would result in, -~~~~notrust +~~~text StaticStruct(<ast::StructDef of A>, Named(~[(<ident of x>, <span of x>)])) StaticStruct(<ast::StructDef of B>, Unnamed(~[<span of x>])) @@ -793,7 +793,7 @@ impl<'a> MethodDef<'a> { /** Creates the nested matches for an enum definition recursively, i.e. - ~~~notrust + ~~~text match self { Variant1 => match other { Variant1 => matching, Variant2 => nonmatching, ... }, Variant2 => match other { Variant1 => nonmatching, Variant2 => matching, ... }, |
