Skip to content

Commit 61f31ae

Browse files
authored
Replace smlxl by duneanalytics github references (#114)
1 parent b7d7a07 commit 61f31ae

Some content is hidden

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

70 files changed

+559
-586
lines changed

.github/workflows/ci.yml

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

99
# Environment variables that will be set on all runners
1010
env:
11-
RUST_VERSION: 1.71.0 # Specify the Rust version to be used on CI.
11+
RUST_VERSION: 1.82.0 # Specify the Rust version to be used on CI.
1212
CARGO_TERM_COLOR: always # Always colour Cargo's output.
1313
CARGO_INCREMENTAL: 0 # Always run without incremental builds on CI.
1414
CARGO_PROFILE_DEV_DEBUG: 0 # Don't embed debug info even though the build is a dev build.
@@ -106,8 +106,8 @@ jobs:
106106
- name: Install rust
107107
uses: actions-rs/toolchain@v1
108108
with:
109-
toolchain: nightly
110109
profile: minimal
110+
toolchain: ${{ env.RUST_VERSION }}
111111
override: true
112112
components: rustfmt
113113
- name: Restore Cache

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ readme = "README.md"
2020
# to let authors opt in to backwards-incompatible changes. Crates using one edition can interoperate with crates using
2121
# another edition, thereby ensuring that there's no ecosystem split.
2222
edition = "2021"
23-
rust-version = "1.71.0"
23+
rust-version = "1.82.0"
2424

2525
# Prevent publishing by accident.
2626
publish = false

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ currently being supported with security updates.
1313
## Reporting a Vulnerability
1414

1515
Vulnerabilities can currently be reported as security advisories at
16-
[this link](https://github.com/smlxl/storage-layout-extractor/security/advisories/new).
16+
[this link](https://github.com/duneanalytics/storage-layout-extractor/security/advisories/new).

docs/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ Getting set up with this project is pretty simple.
1616
1. Clone the repository. If you don't want to contribute directly you can use HTTPS clones:
1717

1818
```shell
19-
git clone https://github.com/smlxlio/storage-layout-extractor
19+
git clone https://github.com/duneanalytics/storage-layout-extractor
2020
```
2121

2222
If you _do_ want to contribute directly to the tree, we recommend cloning over SSH:
2323

2424
```shell
25-
git clone [email protected]:smlxlio/storage-layout-extractor.git
25+
git clone [email protected]:duneanalytics/storage-layout-extractor.git
2626
```
2727

2828
2. Building the project is then as simple as entering the project directory and using `cargo`.
@@ -40,7 +40,7 @@ Getting set up with this project is pretty simple.
4040
## Getting Your Work on `main`
4141

4242
For contributions this repository works on a
43-
[Pull Request](https://github.com/smlxl/storage-layout-extractor/pulls) and subsequent review
43+
[Pull Request](https://github.com/duneanalytics/storage-layout-extractor/pulls) and subsequent review
4444
model, supported by CI to check that things avoid being broken. The process works as follows:
4545

4646
1. If necessary, you fork the repository, but if you have access please create a branch.

rustfmt.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,18 @@
55

66
# High-level configuration, telling rustfmt which featureset to use.
77
edition = "2021"
8-
version = "Two"
98

109
# Configuration controlling general code style.
1110
brace_style = "SameLineWhere"
1211
chain_width = 70
1312
combine_control_expr = true
14-
condense_wildcard_suffixes = true
1513
control_brace_style = "AlwaysSameLine"
1614
empty_item_single_line = true
1715
enum_discrim_align_threshold = 20
1816
fn_single_line = false
1917
force_multiline_blocks = false
2018
format_strings = true
2119
hex_literal_case = "Lower"
22-
indent_style = "Block"
23-
inline_attribute_width = 0
2420
match_arm_blocks = true
2521
reorder_impl_items = true
2622
single_line_let_else_max_width = 70
@@ -53,4 +49,3 @@ comment_width = 80
5349
format_code_in_doc_comments = true
5450
normalize_comments = true
5551
normalize_doc_attributes = true
56-
wrap_comments = true

src/disassembly/disassembler.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,15 @@ use std::rc::Rc;
1111

1212
use crate::{
1313
constant::{
14-
DUP_OPCODE_BASE_VALUE,
15-
LOG_OPCODE_BASE_VALUE,
16-
PUSH_OPCODE_BASE_VALUE,
17-
PUSH_OPCODE_MAX_BYTES,
18-
SWAP_OPCODE_BASE_VALUE,
14+
DUP_OPCODE_BASE_VALUE, LOG_OPCODE_BASE_VALUE, PUSH_OPCODE_BASE_VALUE,
15+
PUSH_OPCODE_MAX_BYTES, SWAP_OPCODE_BASE_VALUE,
1916
},
2017
error::{
2118
container::Locatable,
2219
disassembly::{Error, Result},
2320
},
2421
opcode::{
25-
arithmetic as arith,
26-
control,
27-
environment as env,
28-
logic,
29-
memory as mem,
30-
DynOpcode,
31-
Opcode,
22+
arithmetic as arith, control, environment as env, logic, memory as mem, DynOpcode, Opcode,
3223
},
3324
};
3425

@@ -210,7 +201,9 @@ pub fn disassemble(bytes: &[u8]) -> Result<Vec<DynOpcode>> {
210201
// as invalid
211202
if !push_bytes.is_empty() && push_bytes.len() != push_size as usize {
212203
add_op(ops, control::Invalid::new(last_push));
213-
push_bytes.iter().for_each(|b| add_op(ops, control::Invalid::new(*b)));
204+
for b in &push_bytes {
205+
add_op(ops, control::Invalid::new(*b));
206+
}
214207
} else if push_size != 0 {
215208
let opcode = mem::PushN::new(push_size, push_bytes.clone())
216209
.map_err(|e| e.locate(last_push_start))?;

src/disassembly/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ impl ExecutionThread {
307307

308308
let range_usize: Range<usize> = Range {
309309
start: range.start as usize,
310-
end: range.end as usize,
310+
end: range.end as usize,
311311
};
312312

313313
Some(&self.instructions[range_usize])

src/error/container.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ where
5555
fn locate(self, instruction_pointer: u32) -> Self::Located {
5656
self.map_err(|e| Located {
5757
location: instruction_pointer,
58-
payload: e,
58+
payload: e,
5959
})
6060
}
6161
}

src/error/disassembly.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl container::Locatable for Error {
4444
fn locate(self, instruction_pointer: u32) -> Self::Located {
4545
container::Located {
4646
location: instruction_pointer,
47-
payload: self,
47+
payload: self,
4848
}
4949
}
5050
}

src/error/execution.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl container::Locatable for Error {
6868
fn locate(self, instruction_pointer: u32) -> Self::Located {
6969
container::Located {
7070
location: instruction_pointer,
71-
payload: self,
71+
payload: self,
7272
}
7373
}
7474
}

0 commit comments

Comments
 (0)