Skip to content

Feature/purity #3995

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

Closed
wants to merge 12 commits into from
Closed

Feature/purity #3995

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
428c58b
Forbid duplicate supertraits
catamorphism Nov 16, 2012
cacb085
Made Map.contains_key, contains_key_ref, and get pure.
jesse99 Nov 17, 2012
67a5be9
Moved strptime and strftime into private helper functions.
jesse99 Nov 17, 2012
2af7065
Replace TmMut with inherited mutability
jesse99 Nov 17, 2012
91d6299
Made the time to string functions pure as well as empty_tm.
jesse99 Nov 17, 2012
b4f802e
Made Result.get, get_ref, is_ok, is_err, and iter methods pure.
jesse99 Nov 17, 2012
7720531
Made most of the URL functions pure.
jesse99 Nov 17, 2012
2334158
Made more stuff pure.
jesse99 Nov 17, 2012
71d2cd9
Made merge_sort pure
jesse99 Nov 17, 2012
a4640cb
Fixing warnings for long and blank lines
jesse99 Nov 17, 2012
a176242
Made from_str pure
jesse99 Nov 17, 2012
30fd7ae
Merge with incoming.
jesse99 Nov 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc/middle/typeck/collect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ fn ensure_supertraits(ccx: @crate_ctxt,
for trait_refs.each |trait_ref| {
let (did, tpt) = instantiate_trait_ref(ccx, *trait_ref, rp);
if instantiated.any(|other_trait: &InstantiatedTraitRef|
{ (*other_trait).def_id == did }) {
{ other_trait.def_id == did }) {
// This means a trait inherited from the same supertrait more
// than once.
tcx.sess.span_err(sp, ~"Duplicate supertrait in trait \
Expand Down