Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename Fume -> Sway #56

Merged
merged 2 commits into from
May 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[workspace]

members = ["core_lang", "forc", "test_suite", "fume-server"]

members = ["core_lang", "forc", "sway-server", "test_suite"]
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# Fume
# Sway

Fume is a language developed for the Fuel blockchain. It is heavily inspired by Rust and aims to bring modern language development and performance to the blockchain ecosystem.
Sway is a language developed for the Fuel blockchain. It is heavily inspired by Rust and aims to bring modern language development and performance to the blockchain ecosystem.

## Running the Compiler
To run the compiler from this directory:
```
cargo run --bin forc -- -p <path_to_project>

// e.g.
To run the compiler from this directory:

```sh
cargo run --bin forc -- -p <path_to_project>
cargo run --bin forc -- build -p example_project/fuel_project
```

4 changes: 2 additions & 2 deletions docs/book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ authors = ["John Adler"]
language = "en"
multilingual = false
src = "src"
title = "The Fume Programming Language"
title = "The Sway Programming Language"

[output.html]
git-repository-url = "https://github.com/FuelLabs/fuel-vm-hll"
git-repository-url = "https://github.com/FuelLabs/sway"

[rust]
edition = "2018"
2 changes: 1 addition & 1 deletion docs/src/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# The Fume Programming Language
# The Sway Programming Language
2 changes: 1 addition & 1 deletion docs/src/SUMMARY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Summary

[The Fume Programming Language](./README.md)
[The Sway Programming Language](./README.md)

- [Getting Started](./c01/README.md)
- [Installation](./c01/s01.md)
Expand Down
2 changes: 1 addition & 1 deletion example_project/example_dependency/Forc.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
author = "Alex Hansen"
license = "MIT"
name = "example_dependency"
entry = "main.fm"
entry = "main.sw"


[dependencies]
2 changes: 1 addition & 1 deletion forc/src/ops/forc_init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub(crate) fn init_new_project(project_name: String) -> Result<(), Box<dyn std::

// insert default main function
fs::write(
format!("{}/src/main.fm", project_name),
format!("{}/src/main.sw", project_name),
defaults::default_program(),
)?;

Expand Down
2 changes: 1 addition & 1 deletion forc/src/utils/defaults.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pub(crate) fn default_manifest(project_name: &str) -> String {
author = "{}"
license = "MIT"
name = "{}"
entry = "main.fm"
entry = "main.sw"


[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion forc/src/utils/manifest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub struct Project {
}

fn default_entry() -> String {
"main.fm".into()
"main.sw".into()
}

#[derive(Deserialize, Debug)]
Expand Down
File renamed without changes.
4 changes: 1 addition & 3 deletions fume-server/Cargo.toml → sway-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[package]
authors = ["leviathan88 <elvisdedic@outlook.com>"]
edition = "2018"
name = "fume-server"
name = "sway-server"
version = "0.1.0"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
core_lang = {path = "../core_lang"}
dashmap = "4.0.2"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
author = "Alexander Hansen <alex.hansen@fuel.sh>"
license = "MIT"
name = "script_1"
entry = "main.fm"
entry = "main.sw"


[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
author = "Alexander Hansen <alex.hansen@fuel.sh>"
license = "MIT"
name = "script_1"
entry = "main.fm"
entry = "main.sw"


[dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
author = "Alexander Hansen <alex.hansen@fuel.sh>"
license = "MIT"
name = "script_1"
entry = "main.fm"
entry = "main.sw"


[dependencies]
Expand Down