Skip to content

Commit a18e7d6

Browse files
erickterickt
committed
librustc: minor cleanup
1 parent 53951af commit a18e7d6

File tree

5 files changed

+56
-61
lines changed

5 files changed

+56
-61
lines changed

‎src/librustc/metadata/creader.rs

+31-30
Original file line numberDiff line numberDiff line change
@@ -168,39 +168,40 @@ fn visit_item(e: @mut Env, i: @ast::item) {
168168
let link_args = attr::find_attrs_by_name(i.attrs, "link_args");
169169

170170
match fm.sort {
171-
ast::named => {
172-
let foreign_name =
173-
match attr::first_attr_value_str_by_name(i.attrs,
174-
~"link_name") {
175-
Some(ref nn) => {
176-
if **nn == ~"" {
177-
e.diag.span_fatal(
178-
i.span,
179-
~"empty #[link_name] not allowed; use #[nolink].");
180-
}
181-
(/*bad*/copy *nn)
182-
}
183-
None => @/*bad*/copy *e.intr.get(i.ident)
184-
};
185-
if attr::find_attrs_by_name(i.attrs, ~"nolink").is_empty() {
186-
already_added =
187-
!cstore::add_used_library(cstore,
188-
/*bad*/ copy *foreign_name);
189-
}
190-
if !link_args.is_empty() && already_added {
191-
e.diag.span_fatal(i.span, ~"library '" + *foreign_name +
192-
~"' already added: can't specify link_args.");
171+
ast::named => {
172+
let foreign_name =
173+
match attr::first_attr_value_str_by_name(i.attrs,
174+
~"link_name") {
175+
Some(ref nn) => {
176+
if **nn == ~"" {
177+
e.diag.span_fatal(
178+
i.span,
179+
~"empty #[link_name] not allowed; use " +
180+
~"#[nolink].");
181+
}
182+
/*bad*/copy *nn
183+
}
184+
None => @/*bad*/copy *e.intr.get(i.ident)
185+
};
186+
if attr::find_attrs_by_name(i.attrs, ~"nolink").is_empty() {
187+
already_added =
188+
!cstore::add_used_library(cstore,
189+
/*bad*/ copy *foreign_name);
190+
}
191+
if !link_args.is_empty() && already_added {
192+
e.diag.span_fatal(i.span, ~"library '" + *foreign_name +
193+
~"' already added: can't specify link_args.");
194+
}
193195
}
194-
}
195-
ast::anonymous => { /* do nothing */ }
196+
ast::anonymous => { /* do nothing */ }
196197
}
197198

198199
for link_args.each |a| {
199200
match attr::get_meta_item_value_str(attr::attr_meta(*a)) {
200-
Some(ref linkarg) => {
201-
cstore::add_used_link_args(cstore, /*bad*/copy **linkarg);
202-
}
203-
None => {/* fallthrough */ }
201+
Some(ref linkarg) => {
202+
cstore::add_used_link_args(cstore, /*bad*/copy **linkarg);
203+
}
204+
None => { /* fallthrough */ }
204205
}
205206
}
206207
}
@@ -276,8 +277,8 @@ fn resolve_crate(e: @mut Env,
276277
let cname =
277278
match attr::last_meta_item_value_str_by_name(load_ctxt.metas,
278279
~"name") {
279-
option::Some(ref v) => (/*bad*/copy *v),
280-
option::None => @/*bad*/copy *e.intr.get(ident)
280+
Some(ref v) => /*bad*/copy *v,
281+
None => @/*bad*/copy *e.intr.get(ident),
281282
};
282283
let cmeta = @{name: /*bad*/copy *cname, data: cdata,
283284
cnum_map: cnum_map, cnum: cnum};

‎src/librustc/metadata/cstore.rs

+9-16
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ pub fn get_crate_data(cstore: @mut CStore, cnum: ast::crate_num)
7070

7171
pub fn get_crate_hash(cstore: @mut CStore, cnum: ast::crate_num) -> ~str {
7272
let cdata = get_crate_data(cstore, cnum);
73-
return decoder::get_crate_hash(cdata.data);
73+
decoder::get_crate_hash(cdata.data)
7474
}
7575

7676
pub fn get_crate_vers(cstore: @mut CStore, cnum: ast::crate_num) -> ~str {
7777
let cdata = get_crate_data(cstore, cnum);
78-
return decoder::get_crate_vers(cdata.data);
78+
decoder::get_crate_vers(cdata.data)
7979
}
8080

8181
pub fn set_crate_data(cstore: @mut CStore,
@@ -110,21 +110,21 @@ pub fn get_used_crate_files(cstore: @mut CStore) -> ~[Path] {
110110
pub fn add_used_library(cstore: @mut CStore, +lib: ~str) -> bool {
111111
assert lib != ~"";
112112

113-
if vec::contains(cstore.used_libraries, &lib) { return false; }
113+
if cstore.used_libraries.contains(&lib) { return false; }
114114
cstore.used_libraries.push(lib);
115-
return true;
115+
true
116116
}
117117

118118
pub fn get_used_libraries(cstore: @mut CStore) -> ~[~str] {
119-
return /*bad*/copy cstore.used_libraries;
119+
/*bad*/copy cstore.used_libraries
120120
}
121121

122122
pub fn add_used_link_args(cstore: @mut CStore, args: &str) {
123-
cstore.used_link_args.push_all(str::split_char(args, ' '));
123+
cstore.used_link_args.push_all(args.split_char(' '));
124124
}
125125

126126
pub fn get_used_link_args(cstore: @mut CStore) -> ~[~str] {
127-
return /*bad*/copy cstore.used_link_args;
127+
/*bad*/copy cstore.used_link_args
128128
}
129129

130130
pub fn add_extern_mod_stmt_cnum(cstore: @mut CStore,
@@ -155,21 +155,14 @@ pub fn get_dep_hashes(cstore: @mut CStore) -> ~[~str] {
155155
result.push({name: /*bad*/copy cdata.name, hash: hash});
156156
}
157157

158-
pure fn lteq(a: &crate_hash, b: &crate_hash) -> bool {
159-
a.name <= b.name
160-
}
158+
let sorted = std::sort::merge_sort(result, |a, b| a.name <= b.name);
161159

162-
let sorted = std::sort::merge_sort(result, lteq);
163160
debug!("sorted:");
164161
for sorted.each |x| {
165162
debug!(" hash[%s]: %s", x.name, x.hash);
166163
}
167164

168-
fn mapper(ch: &crate_hash) -> ~str {
169-
return /*bad*/copy ch.hash;
170-
}
171-
172-
return vec::map(sorted, mapper);
165+
sorted.map(|ch| /*bad*/copy ch.hash)
173166
}
174167

175168
// Local Variables:

‎src/librustc/metadata/decoder.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1066,16 +1066,17 @@ fn list_crate_deps(intr: @ident_interner, data: @~[u8], out: io::Writer) {
10661066
pub fn get_crate_hash(data: @~[u8]) -> ~str {
10671067
let cratedoc = reader::Doc(data);
10681068
let hashdoc = reader::get_doc(cratedoc, tag_crate_hash);
1069-
return str::from_bytes(reader::doc_data(hashdoc));
1069+
str::from_bytes(reader::doc_data(hashdoc))
10701070
}
10711071

10721072
pub fn get_crate_vers(data: @~[u8]) -> ~str {
10731073
let attrs = decoder::get_crate_attributes(data);
1074-
return match attr::last_meta_item_value_str_by_name(
1075-
attr::find_linkage_metas(attrs), ~"vers") {
1076-
Some(ref ver) => (/*bad*/copy **ver),
1077-
None => ~"0.0"
1078-
};
1074+
let linkage_attrs = attr::find_linkage_metas(attrs);
1075+
1076+
match attr::last_meta_item_value_str_by_name(linkage_attrs, ~"vers") {
1077+
Some(ref ver) => /*bad*/copy **ver,
1078+
None => ~"0.0"
1079+
}
10791080
}
10801081

10811082
fn iter_crate_items(intr: @ident_interner, cdata: cmd,

‎src/librustc/metadata/loader.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ fn find_library_crate_aux(cx: ctxt,
145145
pub fn crate_name_from_metas(+metas: ~[@ast::meta_item]) -> ~str {
146146
let name_items = attr::find_meta_items_by_name(metas, ~"name");
147147
match vec::last_opt(name_items) {
148-
Some(i) => {
149-
match attr::get_meta_item_value_str(i) {
150-
Some(ref n) => /*bad*/copy **n,
151-
// FIXME (#2406): Probably want a warning here since the user
152-
// is using the wrong type of meta item.
153-
_ => fail!()
148+
Some(i) => {
149+
match attr::get_meta_item_value_str(i) {
150+
Some(ref n) => /*bad*/copy **n,
151+
// FIXME (#2406): Probably want a warning here since the user
152+
// is using the wrong type of meta item.
153+
_ => fail!()
154+
}
154155
}
155-
}
156-
None => fail!(~"expected to find the crate name")
156+
None => fail!(~"expected to find the crate name")
157157
}
158158
}
159159

‎src/librustc/middle/trans/foreign.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn abi_info(arch: session::arch) -> cabi::ABIInfo {
5050
pub fn link_name(ccx: @crate_ctxt, i: @ast::foreign_item) -> ~str {
5151
match attr::first_attr_value_str_by_name(i.attrs, ~"link_name") {
5252
None => ccx.sess.str_of(i.ident),
53-
option::Some(ref ln) => (/*bad*/copy **ln)
53+
Some(ref ln) => /*bad*/copy **ln,
5454
}
5555
}
5656

0 commit comments

Comments
 (0)