Skip to content
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

Move desugarings to lowering step #28857

Merged
merged 15 commits into from
Oct 9, 2015
Merged

Move desugarings to lowering step #28857

merged 15 commits into from
Oct 9, 2015

Conversation

nrc
Copy link
Member

@nrc nrc commented Oct 6, 2015

@bors
Copy link
Contributor

bors commented Oct 6, 2015

☔ The latest upstream changes (presumably #28698) made this pull request unmergeable. Please resolve the merge conflicts.

oli-obk
oli-obk reviewed Oct 6, 2015
View reviewed changes
src/librustdoc/test.rs
@@ -91,8 +92,13 @@ pub fn run(input: &str,
let map = hir_map::map_crate(&mut forest);

let ctx = core::DocContext {
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

some rebase fragments left over

@nikomatsakis
Copy link
Contributor

OK, I apologize for the "stream-of-consciousness" style review, but that's GH for you. r=me modulo:

  1. Test for using unstable code in place/expr of placement new
  2. Fix bug (if any) around unstable code in placer expr
  3. Test that if we lower some AST twice we get same output
    • presumably try to use if let, while let, etc in the test
    • maybe add a note to the comment encouraging future non-trivial lowerings to have a test
  4. Typos

@nikomatsakis
Copy link
Contributor

ps nice comment :)

@nrc
Copy link
Member Author

nrc commented Oct 8, 2015

@bors: r=@nikomatsakis

@bors
Copy link
Contributor

bors commented Oct 8, 2015

📌 Commit 1449841 has been approved by @nikomatsakis

@bors
Copy link
Contributor

bors commented Oct 9, 2015

⌛ Testing commit 1449841 with merge 5bf19b9...

@bors
Copy link
Contributor

bors commented Oct 9, 2015

💔 Test failed - auto-mac-64-nopt-t

@nrc
Copy link
Member Author

nrc commented Oct 9, 2015

@bors: r=nikomatsakis

@bors
Copy link
Contributor

bors commented Oct 9, 2015

📌 Commit a62a529 has been approved by nikomatsakis

bors added a commit that referenced this pull request Oct 9, 2015
@bors
Auto merge of #28857 - nrc:lowering, r=nikomatsakis
c146090 
r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Oct 9, 2015

⌛ Testing commit a62a529 with merge c146090...

@bors
Copy link
Contributor

bors commented Oct 9, 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, auto-win-msvc-32-opt, auto-win-msvc-64-opt

@bors bors merged commit a62a529 into rust-lang:master Oct 9, 2015
@wthrowe wthrowe mentioned this pull request Oct 10, 2015
Closed
@brson
Copy link
Contributor

brson commented Oct 16, 2015

Cool cleanups.

@TimNN TimNN mentioned this pull request Oct 30, 2015
Closed
@ivan ivan mentioned this pull request Oct 31, 2015
Closed
@sanxiyn sanxiyn mentioned this pull request Nov 20, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nikomatsakis nikomatsakis

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nrc @bors @nikomatsakis @brson @oli-obk @ranma42