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.

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

Upgrade to rustc 1.0.0-nightly (6790b0e51 2015-04-11) (built 2015-04-12) #124

Merged
merged 2 commits into from Apr 16, 2015

Conversation

@SimonSapin
Copy link
Member

SimonSapin commented Apr 13, 2015

Also disable doctests because of rust-lang/cargo#1512

Note that there weren’t any doctest to run anyway.

r? @kmcallister

SimonSapin added 2 commits Apr 13, 2015
Also disable doctests because of rust-lang/cargo#1512

Note that there weren’t any doctest to run anyway.
phf = "0.6"
phf_macros = "0.6"
phf = "0.7"
phf_macros = "0.7"

This comment has been minimized.

@kmcallister

kmcallister Apr 13, 2015

Contributor

These should go back to = "0" unless there's a reason to keep them pinned.

This comment has been minimized.

@SimonSapin

SimonSapin Apr 13, 2015

Author Member

Semver says anything goes before 1.0, but Cargo’s extrapolation of it is that any 0.7.x should be compatible with 0.7.y with y <= x, while 0.8 is not. So if phf follows that convention, 0.8 will probably break html5ever while (in a post-Rust-1.0 world) 0.7 will still be available and compatible.

That said, I’ll make them = "0" if you still feel it’s the right thing to do.

This comment has been minimized.

@kmcallister

kmcallister Apr 16, 2015

Contributor

Okay, = "0.7" works for me.

}
})
}

This comment has been minimized.

@kmcallister

kmcallister Apr 13, 2015

Contributor

Why do we need this instead of Result::unwrap()?

This comment has been minimized.

@SimonSapin

SimonSapin Apr 13, 2015

Author Member

This is what libsyntax does:

https://github.com/rust-lang/rust/blob/b9ed9e2a326cafa6f2445aec7221dc419089cf5f/src/libsyntax/lib.rs#L53-L56

A variant of 'try!' that panics on Err(FatalError). This is used as a crutch on the way towards a non-panic!-prone parser. It should be used for fatal parsing errors; eventually we plan to convert all code using panictry to just use normal try

Right now it’s the same as .unwrap, but the plan is apparently that it should be try! eventually.

This comment has been minimized.

@kmcallister

kmcallister Apr 16, 2015

Contributor

Ah, can you add a link or reference to that libsyntax code in a comment here? And, is there an associated Rust issue number?

@kmcallister
Copy link
Contributor

kmcallister commented Apr 16, 2015

Thanks! r=me with the link or reference to libsyntax as mentioned above.

@SimonSapin SimonSapin merged commit 6897845 into master Apr 16, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@SimonSapin SimonSapin deleted the rustup branch May 26, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.