Skip to content

Commit 9df4477

Browse files
committed
---
yaml --- r: 153112 b: refs/heads/try2 c: 35175f0 h: refs/heads/master v: v3
1 parent 5afaa5f commit 9df4477

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: aa91ef0cf814a35037bc562fa37c51549fcf2984
8+
refs/heads/try2: 35175f015ff878d49e3b5562fe3a7addcef25cfc
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ast.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ pub struct TyParam {
190190
pub span: Span
191191
}
192192

193+
/// Represents lifetimes and type parameters attached to a declaration
194+
/// of a function, enum, trait, etc.
193195
#[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash)]
194196
pub struct Generics {
195197
pub lifetimes: Vec<Lifetime>,
@@ -288,7 +290,7 @@ pub enum Pat_ {
288290
PatWild,
289291
PatWildMulti,
290292
// A PatIdent may either be a new bound variable,
291-
// or a nullary enum (in which case the second field
293+
// or a nullary enum (in which case the third field
292294
// is None).
293295
// In the nullary enum case, the parser can't determine
294296
// which it is. The resolver determines this, and

branches/try2/src/libsyntax/ext/expand.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,9 +841,9 @@ fn expand_pat(p: Gc<ast::Pat>, fld: &mut MacroExpander) -> Gc<ast::Pat> {
841841
}
842842
}
843843

844-
// a tree-folder that applies every rename in its (mutable) list
845-
// to every identifier, including both bindings and varrefs
846-
// (and lots of things that will turn out to be neither)
844+
/// A tree-folder that applies every rename in its (mutable) list
845+
/// to every identifier, including both bindings and varrefs
846+
/// (and lots of things that will turn out to be neither)
847847
pub struct IdentRenamer<'a> {
848848
renames: &'a mtwt::RenameList,
849849
}

branches/try2/src/libsyntax/fold.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@ pub fn noop_fold_pat<T: Folder>(p: Gc<Pat>, folder: &mut T) -> Gc<Pat> {
794794
PatIdent(binding_mode, ref pth1, ref sub) => {
795795
PatIdent(binding_mode,
796796
Spanned{span: folder.new_span(pth1.span),
797-
node: folder.fold_ident(pth1.node)},
797+
node: folder.fold_ident(pth1.node)},
798798
sub.map(|x| folder.fold_pat(x)))
799799
}
800800
PatLit(e) => PatLit(folder.fold_expr(e)),

0 commit comments

Comments
 (0)