Skip to content

Commit 3816e57

Browse files
marijnhmarijnh
committed
Downcase std modules again, move to :: for module dereferencing
This should be a snapshot transition.
1 parent b1d3364 commit 3816e57

File tree

168 files changed

+7687
-7652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+7687
-7652
lines changed

‎src/comp/back/Link.rs

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import driver.session;
2-
import lib.llvm.llvm;
3-
import middle.trans;
4-
import std.Str;
5-
import std.FS;
6-
7-
import lib.llvm.llvm.ModuleRef;
8-
import lib.llvm.llvm.ValueRef;
9-
import lib.llvm.mk_pass_manager;
10-
import lib.llvm.mk_target_data;
11-
import lib.llvm.mk_type_names;
12-
import lib.llvm.False;
13-
import lib.llvm.True;
1+
import driver::session;
2+
import lib::llvm::llvm;
3+
import middle::trans;
4+
import std::_str;
5+
import std::fs;
6+
7+
import lib::llvm::llvm::ModuleRef;
8+
import lib::llvm::llvm::ValueRef;
9+
import lib::llvm::mk_pass_manager;
10+
import lib::llvm::mk_target_data;
11+
import lib::llvm::mk_type_names;
12+
import lib::llvm::False;
13+
import lib::llvm::True;
1414

1515
tag output_type {
1616
output_type_none;
@@ -19,32 +19,32 @@ tag output_type {
1919
output_type_object;
2020
}
2121

22-
fn llvm_err(session.session sess, str msg) {
23-
auto buf = llvm.LLVMRustGetLastError();
22+
fn llvm_err(session::session sess, str msg) {
23+
auto buf = llvm::LLVMRustGetLastError();
2424
if ((buf as uint) == 0u) {
2525
sess.err(msg);
2626
} else {
27-
sess.err(msg + ": " + Str.str_from_cstr(buf));
27+
sess.err(msg + ": " + _str::str_from_cstr(buf));
2828
}
2929
fail;
3030
}
3131

32-
fn link_intrinsics(session.session sess, ModuleRef llmod) {
33-
auto path = FS.connect(sess.get_opts().sysroot, "intrinsics.bc");
32+
fn link_intrinsics(session::session sess, ModuleRef llmod) {
33+
auto path = fs::connect(sess.get_opts().sysroot, "intrinsics.bc");
3434
auto membuf =
35-
llvm.LLVMRustCreateMemoryBufferWithContentsOfFile(Str.buf(path));
35+
llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(_str::buf(path));
3636
if ((membuf as uint) == 0u) {
3737
llvm_err(sess, "installation problem: couldn't open intrinstics.bc");
3838
fail;
3939
}
4040

41-
auto llintrinsicsmod = llvm.LLVMRustParseBitcode(membuf);
41+
auto llintrinsicsmod = llvm::LLVMRustParseBitcode(membuf);
4242
if ((llintrinsicsmod as uint) == 0u) {
4343
llvm_err(sess, "installation problem: couldn't parse intrinstics.bc");
4444
fail;
4545
}
4646

47-
if (llvm.LLVMLinkModules(llmod, llintrinsicsmod) == False) {
47+
if (llvm::LLVMLinkModules(llmod, llintrinsicsmod) == False) {
4848
llvm_err(sess, "couldn't link the module with the intrinsics");
4949
fail;
5050
}
@@ -64,29 +64,29 @@ mod Write {
6464
// Decides what to call an intermediate file, given the name of the output
6565
// and the extension to use.
6666
fn mk_intermediate_name(str output_path, str extension) -> str {
67-
auto dot_pos = Str.index(output_path, '.' as u8);
67+
auto dot_pos = _str::index(output_path, '.' as u8);
6868
auto stem;
6969
if (dot_pos < 0) {
7070
stem = output_path;
7171
} else {
72-
stem = Str.substr(output_path, 0u, dot_pos as uint);
72+
stem = _str::substr(output_path, 0u, dot_pos as uint);
7373
}
7474
ret stem + "." + extension;
7575
}
7676

77-
fn run_passes(session.session sess, ModuleRef llmod, str output) {
77+
fn run_passes(session::session sess, ModuleRef llmod, str output) {
7878

7979
auto opts = sess.get_opts();
8080

8181
if (opts.time_llvm_passes) {
82-
llvm.LLVMRustEnableTimePasses();
82+
llvm::LLVMRustEnableTimePasses();
8383
}
8484

8585
link_intrinsics(sess, llmod);
8686

8787
auto pm = mk_pass_manager();
88-
auto td = mk_target_data(x86.get_data_layout());
89-
llvm.LLVMAddTargetData(td.lltd, pm.llpm);
88+
auto td = mk_target_data(x86::get_data_layout());
89+
llvm::LLVMAddTargetData(td.lltd, pm.llpm);
9090

9191
// TODO: run the linter here also, once there are llvm-c bindings for
9292
// it.
@@ -99,13 +99,13 @@ mod Write {
9999
if (opts.optimize) {
100100
auto filename = mk_intermediate_name(output,
101101
"no-opt.bc");
102-
llvm.LLVMWriteBitcodeToFile(llmod,
103-
Str.buf(filename));
102+
llvm::LLVMWriteBitcodeToFile(llmod,
103+
_str::buf(filename));
104104
}
105105
}
106106
case (_) {
107107
auto filename = mk_intermediate_name(output, "bc");
108-
llvm.LLVMWriteBitcodeToFile(llmod, Str.buf(filename));
108+
llvm::LLVMWriteBitcodeToFile(llmod, _str::buf(filename));
109109
}
110110
}
111111
}
@@ -118,13 +118,13 @@ mod Write {
118118
// tool?
119119
if (opts.optimize) {
120120
auto fpm = mk_pass_manager();
121-
llvm.LLVMAddTargetData(td.lltd, fpm.llpm);
122-
llvm.LLVMAddStandardFunctionPasses(fpm.llpm, 2u);
123-
llvm.LLVMRunPassManager(fpm.llpm, llmod);
121+
llvm::LLVMAddTargetData(td.lltd, fpm.llpm);
122+
llvm::LLVMAddStandardFunctionPasses(fpm.llpm, 2u);
123+
llvm::LLVMRunPassManager(fpm.llpm, llmod);
124124

125125
// TODO: On -O3, use 275 instead of 225 for the inlining
126126
// threshold.
127-
llvm.LLVMAddStandardModulePasses(pm.llpm,
127+
llvm::LLVMAddStandardModulePasses(pm.llpm,
128128
2u, // optimization level
129129
False, // optimize for size
130130
True, // unit-at-a-time
@@ -135,7 +135,7 @@ mod Write {
135135
}
136136

137137
if (opts.verify) {
138-
llvm.LLVMAddVerifierPass(pm.llpm);
138+
llvm::LLVMAddVerifierPass(pm.llpm);
139139
}
140140

141141
// TODO: Write .s if -c was specified and -save-temps was on.
@@ -157,32 +157,32 @@ mod Write {
157157
case (_) {
158158
auto filename = mk_intermediate_name(output,
159159
"opt.bc");
160-
llvm.LLVMRunPassManager(pm.llpm, llmod);
161-
llvm.LLVMWriteBitcodeToFile(llmod,
162-
Str.buf(filename));
160+
llvm::LLVMRunPassManager(pm.llpm, llmod);
161+
llvm::LLVMWriteBitcodeToFile(llmod,
162+
_str::buf(filename));
163163
pm = mk_pass_manager();
164164
}
165165
}
166166
}
167167

168-
llvm.LLVMRustWriteOutputFile(pm.llpm, llmod,
169-
Str.buf(x86.get_target_triple()),
170-
Str.buf(output),
168+
llvm::LLVMRustWriteOutputFile(pm.llpm, llmod,
169+
_str::buf(x86::get_target_triple()),
170+
_str::buf(output),
171171
FileType);
172-
llvm.LLVMDisposeModule(llmod);
172+
llvm::LLVMDisposeModule(llmod);
173173
if (opts.time_llvm_passes) {
174-
llvm.LLVMRustPrintPassTimings();
174+
llvm::LLVMRustPrintPassTimings();
175175
}
176176
ret;
177177
}
178178

179-
llvm.LLVMRunPassManager(pm.llpm, llmod);
179+
llvm::LLVMRunPassManager(pm.llpm, llmod);
180180

181-
llvm.LLVMWriteBitcodeToFile(llmod, Str.buf(output));
182-
llvm.LLVMDisposeModule(llmod);
181+
llvm::LLVMWriteBitcodeToFile(llmod, _str::buf(output));
182+
llvm::LLVMDisposeModule(llmod);
183183

184184
if (opts.time_llvm_passes) {
185-
llvm.LLVMRustPrintPassTimings();
185+
llvm::LLVMRustPrintPassTimings();
186186
}
187187
}
188188
}

‎src/comp/back/abi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const int rc_base_field_refcnt = 0;
44

5-
// FIXME: import from std.dbg when imported consts work.
5+
// FIXME: import from std::dbg when imported consts work.
66
const uint const_refcount = 0x7bad_face_u;
77

88
const int task_field_refcnt = 0;
@@ -97,7 +97,7 @@ fn native_glue_name(int n, native_glue_type ngt) -> str {
9797
case (ngt_pure_rust) { prefix = "rust_native_pure_rust_"; }
9898
case (ngt_cdecl) { prefix = "rust_native_cdecl_"; }
9999
}
100-
ret prefix + util.common.istr(n);
100+
ret prefix + util::common::istr(n);
101101
}
102102

103103
fn activate_glue_name() -> str {

‎src/comp/back/upcall.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
import middle.trans;
1+
import middle::trans;
22

3-
import trans.decl_cdecl_fn;
4-
import trans.type_names;
5-
import trans.ModuleRef;
6-
import trans.TypeRef;
7-
import trans.ValueRef;
3+
import trans::decl_cdecl_fn;
4+
import trans::type_names;
5+
import trans::ModuleRef;
6+
import trans::TypeRef;
7+
import trans::ValueRef;
88

9-
import trans.T_crate;
10-
import trans.T_f32;
11-
import trans.T_f64;
12-
import trans.T_fn;
13-
import trans.T_i8;
14-
import trans.T_i32;
15-
import trans.T_int;
16-
import trans.T_opaque_chan_ptr;
17-
import trans.T_opaque_port_ptr;
18-
import trans.T_opaque_vec_ptr;
19-
import trans.T_ptr;
20-
import trans.T_size_t;
21-
import trans.T_str;
22-
import trans.T_taskptr;
23-
import trans.T_tydesc;
24-
import trans.T_void;
9+
import trans::T_crate;
10+
import trans::T_f32;
11+
import trans::T_f64;
12+
import trans::T_fn;
13+
import trans::T_i8;
14+
import trans::T_i32;
15+
import trans::T_int;
16+
import trans::T_opaque_chan_ptr;
17+
import trans::T_opaque_port_ptr;
18+
import trans::T_opaque_vec_ptr;
19+
import trans::T_ptr;
20+
import trans::T_size_t;
21+
import trans::T_str;
22+
import trans::T_taskptr;
23+
import trans::T_tydesc;
24+
import trans::T_void;
2525

2626
type upcalls = rec(
2727
ValueRef grow_task,
@@ -66,13 +66,13 @@ fn declare_upcalls(type_names tn, ModuleRef llmod) -> @upcalls {
6666
let vec[TypeRef] arg_tys = vec(T_taskptr(tn));
6767
for (TypeRef t in tys) { arg_tys += vec(t); }
6868
auto fn_ty = T_fn(arg_tys, rv);
69-
ret trans.decl_cdecl_fn(llmod, "upcall_" + name, fn_ty);
69+
ret trans::decl_cdecl_fn(llmod, "upcall_" + name, fn_ty);
7070
}
7171

7272
auto dv = bind decl(tn, llmod, _, _, T_void());
7373
auto d = bind decl(tn, llmod, _, _, _);
7474

75-
// FIXME: Sigh... remove this when I fix the typechecker pushdown.
75+
// FIXME: Sigh:.. remove this when I fix the typechecker pushdown.
7676
// --pcwalton
7777
let vec[TypeRef] empty_vec = vec();
7878

0 commit comments

Comments
 (0)