T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update no_std support for Rust 2018 Edition.

Browse Source 
With Rust 2018 Edition, the `mod std` trick to alias `core` names to
`std` no longer works, so switch to just having the code use `core`
explicitly.

So instead, switch to just using `core::*` for things that in core.
This is more consistent with other Rust no_std code. And it allows
us to enable `no_std` mode unconditionally in the crates that support
it, which makes testing a little easier.

There actually three cases:

 - For things in std and also in core, like `cmp`: Just use them via
   `core::*`.

 - For things in std and also in alloc, like `Vec`: Import alloc as std, as
   use them from std. This allows them to work on both stable (which
   doesn't provide alloc, but we don't support no_std mode anyway) and
   nightly.

 - For HashMap and similar which are not in core or alloc, import them in
   the top-level lib.rs files from either std or the third-party hashmap_core
   crate, and then have the code use super::hashmap_core.

Also, no_std support continues to be "best effort" at this time and not
something most people need to be testing.
This commit is contained in:
Dan Gohman
2019-01-07 11:04:58 -08:00
parent 50a045363c
commit aeb9161e2c
118 changed files with 322 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/codegen/meta-python/gen_instr.py
View File

@@ -257,8 +257,8 @@ def gen_instruction_data_impl(fmt):
'pub fn eq(&self, other: &Self, pool: &ir::ValueListPool)'
' -> bool {',
'}'):
with fmt.indented('if ::std::mem::discriminant(self) != '
'::std::mem::discriminant(other) {', '}'):
with fmt.indented('if ::core::mem::discriminant(self) != '
'::core::mem::discriminant(other) {', '}'):
fmt.line('return false;')
with fmt.indented('match (self, other) {', '}'):
for f in InstructionFormat.all_formats:
@@ -301,7 +301,7 @@ def gen_instruction_data_impl(fmt):
hash the contents of any `ValueLists`.
""")
with fmt.indented(
'pub fn hash<H: ::std::hash::Hasher>'
'pub fn hash<H: ::core::hash::Hasher>'
'(&self, state: &mut H, pool: &ir::ValueListPool) {',
'}'):
with fmt.indented('match *self {', '}'):
@@ -323,13 +323,13 @@ def gen_instruction_data_impl(fmt):
members.append(field.member)
pat = n + ' { ' + ', '.join(members) + ' }'
with fmt.indented(pat + ' => {', '}'):
fmt.line('::std::hash::Hash::hash( '
'&::std::mem::discriminant(self), state);')
fmt.line('::std::hash::Hash::hash(&opcode, state);')
fmt.line('::core::hash::Hash::hash( '
'&::core::mem::discriminant(self), state);')
fmt.line('::core::hash::Hash::hash(&opcode, state);')
for field in f.imm_fields:
fmt.line('::std::hash::Hash::hash(&{}, state);'
fmt.line('::core::hash::Hash::hash(&{}, state);'
.format(field.member))
fmt.line('::std::hash::Hash::hash({}, state);'
fmt.line('::core::hash::Hash::hash({}, state);'
.format(args))