Skip to content

Use an iterator for reader::tagged_docs. #25760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
May 29, 2015
Merged

Use an iterator for reader::tagged_docs. #25760

merged 3 commits into from
May 29, 2015

Conversation

Ms2ger
Copy link
Contributor

@Ms2ger Ms2ger commented May 24, 2015

No description provided.

@rust-highfive
Copy link
Contributor

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton
alexcrichton reviewed May 26, 2015
View reviewed changes
src/librustc/metadata/decoder.rs
@@ -233,10 +220,16 @@ fn get_provided_source(d: rbml::Doc, cdata: Cmd) -> Option<ast::DefId> {
})
}

fn each_reexport<F>(d: rbml::Doc, f: F) -> bool where
fn each_reexport<F>(d: rbml::Doc, mut f: F) -> bool where
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps this could return a TaggedDocsIterator instead of continuing to use a closure?

@alexcrichton
Copy link
Member

I do love me some iterator goodness, thanks @Ms2ger!

@alexcrichton alexcrichton assigned alexcrichton and unassigned brson May 26, 2015
@Ms2ger
Copy link
Contributor Author

Ms2ger commented May 27, 2015

r? @alexcrichton

@alexcrichton
Copy link
Member

@bors: r+ 817ca99

Manishearth added a commit to Manishearth/rust that referenced this pull request May 27, 2015
@Manishearth
Rollup merge of rust-lang#25760 - Ms2ger:tagged_docs, r=alexcrichton
0162658
@Manishearth Manishearth mentioned this pull request May 27, 2015
Merged
@bors
Copy link
Collaborator

bors commented May 27, 2015

⌛ Testing commit 817ca99 with merge eddab67...

@bors
Copy link
Collaborator

bors commented May 27, 2015

💔 Test failed - auto-linux-64-x-android-t

Manishearth added a commit to Manishearth/rust that referenced this pull request May 27, 2015
@Manishearth
Rollup merge of rust-lang#25760 - Ms2ger:tagged_docs, r=alexcrichton
09a3a59
bors added a commit that referenced this pull request May 27, 2015
@bors
Auto merge of #25827 - Manishearth:rollup, r=Manishearth
47f9e52 
- Successful merges: #25128, #25651, #25668, #25726, #25760, #25792, #25806, #25807
- Failed merges:
@Manishearth
Copy link
Member 

/home/rustbuild/src/rust-buildbot/slave/auto-linux-64-x-android-t/build/src/librustc/metadata/decoder.rs:222:39: 222:61 error: use of undeclared type name `TaggedDocsIterator`
/home/rustbuild/src/rust-buildbot/slave/auto-linux-64-x-android-t/build/src/librustc/metadata/decoder.rs:222 fn reexports<'a>(d: rbml::Doc<'a>) -> TaggedDocsIterator<'a> {

@Manishearth
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented May 28, 2015

📌 Commit 0886b56 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented May 28, 2015

⌛ Testing commit 0886b56 with merge ba84047...

@bors
Copy link
Collaborator

bors commented May 28, 2015

💔 Test failed - auto-linux-64-x-android-t

@Manishearth
Copy link
Member 

/home/rustbuild/src/rust-buildbot/slave/auto-linux-64-x-android-t/build/src/librustc/metadata/decoder.rs:634:9: 634:13 error: mismatched types:
 expected `()`,
    found `bool`
(expected (),
    found bool) [E0308]
/home/rustbuild/src/rust-buildbot/slave/auto-linux-64-x-android-t/build/src/librustc/metadata/decoder.rs:634         true
                                                                                                                     ^~~~
note: in expansion of for loop expansion
/home/rustbuild/src/rust-buildbot/slave/auto-linux-64-x-android-t/build/src/librustc/metadata/decoder.rs:604:5: 635:6 note: expansion site
/home/rustbuild/src/rust-buildbot/slave/auto-linux-64-x-android-t/build/src/librustc/metadata/decoder.rs:634:9: 634:13 help: run `rustc --explain E0308` to see a detailed explanation
error: aborting due to previous error
make: *** [x86_64-unknown-linux-gnu/stage0/lib/rustlib/x86_64-unknown-linux-gnu/lib/stamp.rustc] Error 101

steveklabnik added a commit to steveklabnik/rust that referenced this pull request May 29, 2015
@steveklabnik
Rollup merge of rust-lang#25760 - Ms2ger:tagged_docs, r=Manishearth
0ff640c
@steveklabnik steveklabnik mentioned this pull request May 29, 2015
Closed
@steveklabnik
Copy link
Member

@bors: r-

@steveklabnik
Copy link
Member

this caused #25870 to fail, i think

@Manishearth
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented May 29, 2015

📌 Commit b700b37 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented May 29, 2015

⌛ Testing commit b700b37 with merge 2de64ef...

bors added a commit that referenced this pull request May 29, 2015
@bors
Auto merge of #25760 - Ms2ger:tagged_docs, r=Manishearth
2de64ef
@bors
Copy link
Collaborator

bors commented May 29, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt

@bors bors merged commit b700b37 into rust-lang:master May 29, 2015
@Ms2ger Ms2ger deleted the tagged_docs branch May 29, 2015 17:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Ms2ger @rust-highfive @alexcrichton @bors @Manishearth @steveklabnik @brson