about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-03-22 13:01:52 -0700
committerbors <bors@rust-lang.org>2014-03-22 13:01:52 -0700
commit7e7a5e3d3eabe0ee46474b0eb701c159a45b490f (patch)
tree70ed4399cd98654d6ba75b4251b8478868ab063a /src/libsyntax
parent0e6f90eb89021342935de9af2f014fbee5805855 (diff)
parenta1cb2f5d8c4ce807b27b09344b5ef7d9cd94c04d (diff)
downloadrust-7e7a5e3d3eabe0ee46474b0eb701c159a45b490f.tar.gz
rust-7e7a5e3d3eabe0ee46474b0eb701c159a45b490f.zip
auto merge of #13076 : FlaPer87/rust/remove-freeze, r=alexcrichton
This PR removes the `Freeze` kind and the `NoFreeze` marker completely.

Fixes #12577

cc @nikomatsakis r?
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 41038705d4d..f2a256165e2 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -169,7 +169,7 @@ pub static DUMMY_NODE_ID: NodeId = -1;
 // The AST represents all type param bounds as types.
 // typeck::collect::compute_bounds matches these against
 // the "special" built-in traits (see middle::lang_items) and
-// detects Copy, Send, Send, and Freeze.
+// detects Copy, Send and Share.
 #[deriving(Clone, Eq, Encodable, Decodable, Hash)]
 pub enum TyParamBound {
     TraitTyParamBound(TraitRef),