From 5efaa4f628d4d5fcef263b06f37995abb2794321 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Thu, 13 Jun 2013 23:16:30 +1000 Subject: [PATCH 1/3] syntax: correct the Rand::rand call to select enum variants in #[deriving(Rand)]. Previously, this was not a global call, and so when `#[deriving(Rand)]` was in any module other than the top-level one, it failed (unless there was a `use std;` in scope). Also, fix a minor inconsistency between uints and u32s for this piece of code. --- src/libsyntax/ext/deriving/rand.rs | 9 ++++--- src/test/run-pass/deriving-global.rs | 39 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/test/run-pass/deriving-global.rs diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index ab5ac6d784793..79aa3469f74bb 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.rs @@ -78,19 +78,20 @@ fn rand_substructure(cx: @ExtCtxt, span: span, substr: &Substructure) -> @expr { let variant_count = cx.expr_uint(span, variants.len()); - // need to specify the uint-ness of the random number - let u32_ty = cx.ty_ident(span, cx.ident_of("uint")); + // need to specify the u32-ness of the random number + let u32_ty = cx.ty_ident(span, cx.ident_of("u32")); let r_ty = cx.ty_ident(span, cx.ident_of("R")); - let rand_name = cx.path_all(span, false, copy rand_ident, None, ~[ u32_ty, r_ty ]); + let rand_name = cx.path_all(span, true, copy rand_ident, None, ~[ u32_ty, r_ty ]); let rand_name = cx.expr_path(rand_name); + // ::std::rand::Rand::rand::(rng) let rv_call = cx.expr_call(span, rand_name, ~[ rng[0].duplicate(cx) ]); // rand() % variants.len() let rand_variant = cx.expr_binary(span, ast::rem, - rv_call, variant_count); + rv_call, variant_count); let mut arms = do variants.mapi |i, id_sum| { let i_expr = cx.expr_uint(span, i); diff --git a/src/test/run-pass/deriving-global.rs b/src/test/run-pass/deriving-global.rs new file mode 100644 index 0000000000000..fce6d17c5f015 --- /dev/null +++ b/src/test/run-pass/deriving-global.rs @@ -0,0 +1,39 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +extern mod extra; // {En,De}codable +mod submod { + // if any of these are implemented without global calls for any + // function calls, then being in a submodule will (correctly) + // cause errors about unrecognised module `std` (or `extra`) + #[deriving(Eq, Ord, TotalEq, TotalOrd, + IterBytes, + Clone, DeepClone, + ToStr, Rand, + Encodable, Decodable)] + enum A { A1(uint), A2(int) } + + #[deriving(Eq, Ord, TotalEq, TotalOrd, + IterBytes, + Clone, DeepClone, + ToStr, Rand, + Encodable, Decodable)] + struct B { x: uint, y: int } + + #[deriving(Eq, Ord, TotalEq, TotalOrd, + IterBytes, + Clone, DeepClone, + ToStr, Rand, + Encodable, Decodable)] + struct C(uint, int); + +} + +fn main() {} From 8b9f913399e7a069544be1997bbf81eccc6c149b Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Fri, 14 Jun 2013 00:35:06 +1000 Subject: [PATCH 2/3] syntax: revert the uint -> u32 "fix"; make the names/comment match. --- src/libsyntax/ext/deriving/rand.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index 79aa3469f74bb..b890623b9638e 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.rs @@ -78,13 +78,13 @@ fn rand_substructure(cx: @ExtCtxt, span: span, substr: &Substructure) -> @expr { let variant_count = cx.expr_uint(span, variants.len()); - // need to specify the u32-ness of the random number - let u32_ty = cx.ty_ident(span, cx.ident_of("u32")); + // need to specify the uint-ness of the random number + let uint_ty = cx.ty_ident(span, cx.ident_of("uint")); let r_ty = cx.ty_ident(span, cx.ident_of("R")); - let rand_name = cx.path_all(span, true, copy rand_ident, None, ~[ u32_ty, r_ty ]); + let rand_name = cx.path_all(span, true, copy rand_ident, None, ~[ uint_ty, r_ty ]); let rand_name = cx.expr_path(rand_name); - // ::std::rand::Rand::rand::(rng) + // ::std::rand::Rand::rand::(rng) let rv_call = cx.expr_call(span, rand_name, ~[ rng[0].duplicate(cx) ]); From 7f27ab9e5e3f62c2379a886c6cb3b2d0688dc921 Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Fri, 14 Jun 2013 01:55:35 +1000 Subject: [PATCH 3/3] xfail test on windows, because extern mod doesn't work there --- src/test/run-pass/deriving-global.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/run-pass/deriving-global.rs b/src/test/run-pass/deriving-global.rs index fce6d17c5f015..3d5bacee71c67 100644 --- a/src/test/run-pass/deriving-global.rs +++ b/src/test/run-pass/deriving-global.rs @@ -1,3 +1,5 @@ +// xfail-test #7103 `extern mod` does not work on windows + // Copyright 2013 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT.