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

Change more names from BuckleScript to ReScript #4617

Merged
merged 1 commit into from
Aug 12, 2020
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
4 changes: 2 additions & 2 deletions esy.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
}
}
},
"description": "bucklescript compiler for use in esy, ocaml standard libary by bucklescript and its required runtime support",
"description": "ReScript compiler for use in esy, ocaml standard libary by ReScript and its required runtime support",
"repository": {
"type": "git",
"url": "git+https://github.com/rescript-lang/rescript-compiler.git"
},
"keywords": ["ocaml", "bucklescript", "stdlib", "functional programming"],
"keywords": ["ocaml", "rescript", "stdlib", "functional programming"],
"author": {
"name": "Hongbo Zhang"
},
Expand Down
2 changes: 1 addition & 1 deletion jscomp/Docs.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Hello! This is the main directory for BuckleScript. `jscomp` is just a name that mirrors OCaml's own `bytecomp` and `asmcomp` (bytecode compilation and native compilation logic respectively). For building it, please see [CONTRIBUTING.md](../CONTRIBUTING.md).
Hello! This is the main directory for ReScript. `jscomp` is just a name that mirrors OCaml's own `bytecomp` and `asmcomp` (bytecode compilation and native compilation logic respectively). For building it, please see [CONTRIBUTING.md](../CONTRIBUTING.md).

## Sub directories

Expand Down
13 changes: 3 additions & 10 deletions jscomp/bin/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Note this directory is created mainly for easy distribution of
BuckleScript
This directory is created mainly for easy distribution of ReScript

# TODO: Build a stand-alone compiler

Expand All @@ -12,12 +11,6 @@ BuckleScript
The runtime should be rewritten to avoid using (String/Bytes) (since
we modified it) any standard library.

Since BuckleScript has different `cmi_format` from `4.02.3` due to
Since ReScript has different `cmi_format` from `4.02.3` due to
external attributes, so `cmis` generated by `OCaml 4.02.3` is not ABI
compatible with `cmis` generated by `BuckleScript`






compatible with `cmis` generated by ReScript
2 changes: 1 addition & 1 deletion jscomp/bsb/Docs.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# BSB

Bsb is BuckleScript's build system. User-facing documentations are [here](https://bucklescript.github.io/docs/en/build-overview.html).
Bsb is ReScript's build system. User-facing documentations are [here](https://bucklescript.github.io/docs/en/build-overview.html).

This directory hosts its implementation. It reads into `bsconfig.json`, uses some BS/OCaml/Reason-specific logic, and generates a [ninja](https://ninja-build.org) build file then calls `ninja` on it. So much of the incremental build and perf work is delegated to Ninja.

Expand Down
2 changes: 1 addition & 1 deletion jscomp/bsb_helper/bsb_helper_depfile_gen.ml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ let output_file (buf : Ext_buffer.t) source namespace =
Ext_buffer.add_string buf
(Ext_namespace_encode.make ?ns:namespace source)

(** for bucklescript artifacts
(** for rescript artifacts
[lhs_suffix] is [.cmj]
[rhs_suffix]
is [.cmj] if it has [ml] (in this case does not care about mli or not)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "bsb -make-world -w"
},
"keywords": [
"BuckleScript"
"rescript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/case/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "bsb -make-world -w"
},
"keywords": [
"BuckleScript"
"rescript"
],
"license": "MIT",
"devDependencies": {
Expand Down
8 changes: 5 additions & 3 deletions jscomp/core/design.md
Original file line number Diff line number Diff line change
Expand Up @@ -407,16 +407,18 @@ need check `Praise of raise_kind`

# Several module components can have the same name #978

Note BuckleScript compiler simply complain if exports have the same component name, this keeps its soundness.
A funny thing is that open variants does not have record disambiguion so that
Note: ReScript compiler complains if exports have the same component name, this keeps its soundness.

A funny thing is that open variants does not have record disambiguion so that for:

```ocaml
type a = ..
type b = ..
type a += A
type b += A
```
The compiler will only expose the last `A`, which means, BuckleScript will not complain, the limitation

The compiler will only expose the last `A`, which means, ReScript will not complain, the limitation
of the compiler preserves its soundness

# Print import module names
Expand Down
2 changes: 1 addition & 1 deletion jscomp/core/js_implementation.ml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
(* *)
(***********************************************************************)

(* adapted by bucklescript from [driver/compile.ml] for convenience *)
(* adapted by rescript from [driver/compile.ml] for convenience *)

open Format
open Typedtree
Expand Down
2 changes: 1 addition & 1 deletion jscomp/main/bsb_main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ let bsb_main_flags : (string * spec * string) array =
"-theme", String (String_set current_theme),
"The theme for project initialization. \n\
default is basic:\n\
https://github.com/bucklescript/bucklescript/tree/master/jscomp/bsb/templates";
https://github.com/rescript-lang/rescript-compiler/tree/master/jscomp/bsb/templates";

"-regen", unit_set_spec force_regenerate,
"*internal* \n\
Expand Down
4 changes: 2 additions & 2 deletions jscomp/main/builtin_cmj_datasets.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(* 589509a1b2244e4936ca841728144dd2 *)
(* da202f86558333ea0e8b3c13ffaed710 *)
let module_names : string array = Obj.magic (
"Js" (* 23 *),
"Arg" (* 289 *),
Expand Down Expand Up @@ -168,7 +168,7 @@ let module_data : string array = Obj.magic (
(* Random *)"\132\149\166\190\000\000\000\231\000\000\000O\000\000\001\001\000\000\000\246\160\b\000\0000\000\176#int\144\160\160A@@@\176$bits\144\160\160A@@@\176$bool\144\160\160A@@@\176$init\144\160\160A@@@\176%State\145\b\000\000$\000\160\160A@@\160\160A@@\160\160A@@\160\160A@@\160\160B@@\160\160B@@\160\160B@@\160\160B@@\160\160A@@@\176%float\144\160\160A@@@\176%int32\144\160\160A@@@\176%int64\144\160\160A@@@\176)full_init\144\160\160A@@@\176)get_state\144\160\160A@@@\176)self_init\144\160\160A@@@\176)set_state\144\160\160A@@@A",
(* Stream *)"\132\149\166\190\000\000\0012\000\000\000k\000\000\001U\000\000\001@\160\b\000\000T\000\176$dump\144\160\160B@@@\176$from\144\160\160A@@@\176$iapp\144\160\160B@@@\176$iter\144\160\160B@@@\176$junk\144\160\160A@@@\176$lapp\144\160\160B@@@\176$next\144\160\160A@@@\176$peek\144\160\160A@@@\176%count\144\160\160A@@@\176%empty\144\160\160A@@@\176%icons\144\160\160B@@@\176%ising\144\160\160A@@@\176%lcons\144\160\160B@@@\176%lsing\144\160\160A@@@\176%npeek\144\160\160B@@@\176%slazy\144\160\160A@@@\176&sempty\144@\144\146A\176'of_list\144\160\160A@@@\176(of_bytes\144\160\160A@@@\176)of_string\144\160\160A@@@\176*of_channel\144\160\160A@@@A",
(* String *)"\132\149\166\190\000\000\t#\000\000\002j\000\000\b\016\000\000\007\198\160\b\000\000\140\000\176#map\144\160\160B@@@\176#sub\144\160\160C@@@\176$blit\144\160\160E@@@\176$copy\144\160\160A@@\144\148\192A\160\176\001\004.!s@@\147\192\151\176\161i\1460unsafe_to_string\160\145\176@%BytesA@\176\192&_none_A@\000\255\004\002A\160\147\192\151\176\161C\146$copy\160\145\004\015@\004\r\160\147\192\151\176\161j\1460unsafe_of_string\160\145\004\025@\004\023\160\144\004&@\176\1924stdlib-406/string.mlm\001\b\137\001\b\146\192\004\002m\001\b\137\001\b\153@@@\176\192\004\004m\001\b\137\001\b\139\004\003@A@\176\004\002\192\004\006m\001\b\137\001\b\160@@\160BA\176$fill\144\160\160D@@@\176$init\144\160\160B@@\144\148\192B\160\176\001\004+!n@\160\176\001\004,!f@@\147\192\151\176\004@\160\004=@\004:\160\147\192\151\176\161A\146$init\160\145\004F@\004D\160\144\004\022\160\144\004\021@\176\192\004/k\001\bh\001\bj\192\0040k\001\bh\001\bt@A@\176\004\003\192\0042k\001\bh\001\b{@@\160BA\176$iter\144\160\160B@@@\176$make\144\160\160B@@\144\148\192B\160\176\001\005\173$prim@\160\176\001\005\172\004\003@@\151\176\1482caml_string_repeat\160\144\004\n\160\144\004\t@\176\192\004Oh\001\b\025\001\b\025\192\004Ph\001\b\025\001\bU@\160BA\176$mapi\144\160\160B@@@\176$trim\144\160\160A@@@\176%equal\144\160\160B@@\144\148\192B\160\176\001\005\171\004#@\160\176\001\005\170\004%@@\151\176\1481caml_string_equal\160\144\004\t\160\144\004\t@\176\192\004q\001\000\204\001\025\144\001\025\144\192\004r\001\000\204\001\025\144\001\025\207@\160BA\176%index\144\160\160B@@@\176%iteri\144\160\160B@@@\176&concat\144\160\160B@@@\176&rindex\144\160\160B@@@\176'compare\144\160\160B@@\144\148\192B\160\176\001\004\169!x@\160\176\001\004\170!y@@\151\176\1483caml_string_compare\160\144\004\011\160\144\004\n@\176\192\004\159\001\000\203\001\025]\001\025y\192\004\160\001\000\203\001\025]\001\025\143@\160BA\176'escaped\144\160\160A@@@\176(contains\144\160\160B@@@\176)index_opt\144\160\160B@@@\176)lowercase\144\160\160A@@\144\148\192A\160\176\001\005y!s@@\147\192\151\176\004\225\160\004\222@\004\219\160\147\192\151\176\161`\146)lowercase\160\145\004\231@\004\229\160\147\192\151\176\004\216\160\004\213@\004\235\160\144\004\025@\176\192\004\212\001\000\222\001\027b\001\027p\192\004\213\001\000\222\001\027b\001\027w@@@\176\192\004\215\001\000\222\001\027b\001\027d\004\003@A@\176\004\002\192\004\217\001\000\222\001\027b\001\027~@@\160BA\176)uppercase\144\160\160A@@\144\148\192A\160\176\001\005w!s@@\147\192\151\176\005\001\011\160\005\001\b@\005\001\005\160\147\192\151\176\161_\146)uppercase\160\145\005\001\017@\005\001\015\160\147\192\151\176\005\001\002\160\004\255@\005\001\021\160\144\004\025@\176\192\004\254\001\000\220\001\0273\001\027A\192\004\255\001\000\220\001\0273\001\027H@@@\176\192\005\001\001\001\000\220\001\0273\001\0275\004\003@A@\176\004\002\192\005\001\003\001\000\220\001\0273\001\027O@@\160BA\176*capitalize\144\160\160A@@\144\148\192A\160\176\001\005{!s@@\147\192\151\176\005\0015\160\005\0012@\005\001/\160\147\192\151\176\161a\146*capitalize\160\145\005\001;@\005\0019\160\147\192\151\176\005\001,\160\005\001)@\005\001?\160\144\004\025@\176\192\005\001(\001\000\224\001\027\146\001\027\161\192\005\001)\001\000\224\001\027\146\001\027\168@@@\176\192\005\001+\001\000\224\001\027\146\001\027\148\004\003@A@\176\004\002\192\005\001-\001\000\224\001\027\146\001\027\175@@\160BA\176*index_from\144\160\160C@@@\176*rindex_opt\144\160\160B@@@\176+rindex_from\144\160\160C@@@\176,uncapitalize\144\160\160A@@\144\148\192A\160\176\001\005}!s@@\147\192\151\176\005\001n\160\005\001k@\005\001h\160\147\192\151\176\161b\146,uncapitalize\160\145\005\001t@\005\001r\160\147\192\151\176\005\001e\160\005\001b@\005\001x\160\144\004\025@\176\192\005\001a\001\000\226\001\027\197\001\027\214\192\005\001b\001\000\226\001\027\197\001\027\221@@@\176\192\005\001d\001\000\226\001\027\197\001\027\199\004\003@A@\176\004\002\192\005\001f\001\000\226\001\027\197\001\027\228@@\160BA\176-contains_from\144\160\160C@@@\176-split_on_char\144\160\160B@@@\176.index_from_opt\144\160\160C@@@\176.rcontains_from\144\160\160C@@@\176/lowercase_ascii\144\160\160A@@\144\148\192A\160\176\001\004\162!s@@\147\192\151\176\005\001\172\160\005\001\169@\005\001\166\160\147\192\151\176\161d\146/lowercase_ascii\160\145\005\001\178@\005\001\176\160\147\192\151\176\005\001\163\160\005\001\160@\005\001\182\160\144\004\025@\176\192\005\001\159\001\000\195\001\024\170\001\024\190\192\005\001\160\001\000\195\001\024\170\001\024\197@@@\176\192\005\001\162\001\000\195\001\024\170\001\024\172\004\003@A@\176\004\002\192\005\001\164\001\000\195\001\024\170\001\024\204@@\160BA\176/rindex_from_opt\144\160\160C@@@\176/uppercase_ascii\144\160\160A@@\144\148\192A\160\176\001\004\160!s@@\147\192\151\176\005\001\219\160\005\001\216@\005\001\213\160\147\192\151\176\161c\146/uppercase_ascii\160\145\005\001\225@\005\001\223\160\147\192\151\176\005\001\210\160\005\001\207@\005\001\229\160\144\004\025@\176\192\005\001\206\001\000\193\001\024o\001\024\131\192\005\001\207\001\000\193\001\024o\001\024\138@@@\176\192\005\001\209\001\000\193\001\024o\001\024q\004\003@A@\176\004\002\192\005\001\211\001\000\193\001\024o\001\024\145@@\160BA\1760capitalize_ascii\144\160\160A@@\144\148\192A\160\176\001\004\164!s@@\147\192\151\176\005\002\005\160\005\002\002@\005\001\255\160\147\192\151\176\161e\1460capitalize_ascii\160\145\005\002\011@\005\002\t\160\147\192\151\176\005\001\252\160\005\001\249@\005\002\015\160\144\004\025@\176\192\005\001\248\001\000\197\001\024\230\001\024\251\192\005\001\249\001\000\197\001\024\230\001\025\002@@@\176\192\005\001\251\001\000\197\001\024\230\001\024\232\004\003@A@\176\004\002\192\005\001\253\001\000\197\001\024\230\001\025\t@@\160BA\1762uncapitalize_ascii\144\160\160A@@\144\148\192A\160\176\001\004\166!s@@\147\192\151\176\005\002/\160\005\002,@\005\002)\160\147\192\151\176\161f\1462uncapitalize_ascii\160\145\005\0025@\005\0023\160\147\192\151\176\005\002&\160\005\002#@\005\0029\160\144\004\025@\176\192\005\002\"\001\000\199\001\025%\001\025<\192\005\002#\001\000\199\001\025%\001\025C@@@\176\192\005\002%\001\000\199\001\025%\001\025'\004\003@A@\176\004\002\192\005\002'\001\000\199\001\025%\001\025J@@\160BAA",
(* Belt_Id *)"\132\149\166\190\000\000\003\004\000\000\000\233\000\000\002\241\000\000\002\221\160\b\000\000 \000\176(hashable\144\160\160B@@@\176)hashableU\144\160\160B@@\144\148\192B\160\176\001\004\182$hash@\160\176\001\004\183\"eq@@\151\176\176@\145\160$hash\160\"eq@@\160\144\004\015\160\144\004\014@\176\1921others/belt_Id.ml\000e\001\011s\001\011s\192\004\002\000h\001\011\150\001\011\153@\160BA\176*comparable\144\160\160A@@@\176+comparableU\144\160\160A@@\144\148\192A\160\176\001\004w#cmp@@\151\176\176@\145\160#cmp@@\160\144\004\n@\176\192\004\029r\001\007\150\001\007\150\192\004\030u\001\007\185\001\007\188@\160BA\176,MakeHashable\144\160\160A@@\144\148\192A\160\176\001\005&!M@@\197A\176\001\004\174$hash@\151\176\161@\146$hash\160\144\004\012@\176\192&_none_A@\000\255\004\002A\197B\176\001\004\173$hash@\148\192A\160\176\001\004\175!a@@\147\192\144\004\023\160\144\004\007@\176\192\004F\000s\001\0120\001\012W\192\004G\000s\001\0120\001\012]@@\160BA\197A\176\001\004\177\"eq@\151\176\161A\146\"eq\160\144\004*@\004\030\197B\176\001\004\176\"eq@\148\192B\160\176\001\004\178!a@\160\176\001\004\179!b@@\147\192\144\004\023\160\144\004\n\160\144\004\t@\176\192\004f\000u\001\012i\001\012\142\192\004g\000u\001\012i\001\012\148@@\160BA\151\176\176@\145\160\0044\160\004\026@@\160\144\0048\160\144\004\031@\176\192\004t\000o\001\011\253\001\011\253\192\004u\000v\001\012\149\001\012\152@\160B@\176-MakeHashableU\144\160\160A@@\144\148\192A\160\176\001\005(!M@@\144\004\003\160B@\176.MakeComparable\144\160\160A@@\144\148\192A\160\176\001\005)!M@@\197A\176\001\004r#cmp@\151\176\161@\146#cmp\160\144\004\012@\004d\197B\176\001\004q#cmp@\148\192B\160\176\001\004s!a@\160\176\001\004t!b@@\147\192\144\004\023\160\144\004\n\160\144\004\t@\176\192\004\172\000@\001\b\185\001\b\224\192\004\173\000@\001\b\185\001\b\231@@\160BA\151\176\176@\145\160\004\025@@\160\144\004\028@\176\192\004\183{\001\b\n\001\b\n\192\004\184\000A\001\b\232\001\b\235@\160B@\176/MakeComparableU\144\160\160A@@\144\148\192A\160\176\001\005+!M@@\144\004\003\160B@A",
(* Belt_Id *)"\132\149\166\190\000\000\003\004\000\000\000\233\000\000\002\241\000\000\002\221\160\b\000\000 \000\176(hashable\144\160\160B@@@\176)hashableU\144\160\160B@@\144\148\192B\160\176\001\004\182$hash@\160\176\001\004\183\"eq@@\151\176\176@\145\160$hash\160\"eq@@\160\144\004\015\160\144\004\014@\176\1921others/belt_Id.ml\000e\001\011y\001\011y\192\004\002\000h\001\011\156\001\011\159@\160BA\176*comparable\144\160\160A@@@\176+comparableU\144\160\160A@@\144\148\192A\160\176\001\004w#cmp@@\151\176\176@\145\160#cmp@@\160\144\004\n@\176\192\004\029r\001\007\150\001\007\150\192\004\030u\001\007\185\001\007\188@\160BA\176,MakeHashable\144\160\160A@@\144\148\192A\160\176\001\005&!M@@\197A\176\001\004\174$hash@\151\176\161@\146$hash\160\144\004\012@\176\192&_none_A@\000\255\004\002A\197B\176\001\004\173$hash@\148\192A\160\176\001\004\175!a@@\147\192\144\004\023\160\144\004\007@\176\192\004F\000s\001\0126\001\012]\192\004G\000s\001\0126\001\012c@@\160BA\197A\176\001\004\177\"eq@\151\176\161A\146\"eq\160\144\004*@\004\030\197B\176\001\004\176\"eq@\148\192B\160\176\001\004\178!a@\160\176\001\004\179!b@@\147\192\144\004\023\160\144\004\n\160\144\004\t@\176\192\004f\000u\001\012o\001\012\148\192\004g\000u\001\012o\001\012\154@@\160BA\151\176\176@\145\160\0044\160\004\026@@\160\144\0048\160\144\004\031@\176\192\004t\000o\001\012\003\001\012\003\192\004u\000v\001\012\155\001\012\158@\160B@\176-MakeHashableU\144\160\160A@@\144\148\192A\160\176\001\005(!M@@\144\004\003\160B@\176.MakeComparable\144\160\160A@@\144\148\192A\160\176\001\005)!M@@\197A\176\001\004r#cmp@\151\176\161@\146#cmp\160\144\004\012@\004d\197B\176\001\004q#cmp@\148\192B\160\176\001\004s!a@\160\176\001\004t!b@@\147\192\144\004\023\160\144\004\n\160\144\004\t@\176\192\004\172\000@\001\b\191\001\b\230\192\004\173\000@\001\b\191\001\b\237@@\160BA\151\176\176@\145\160\004\025@@\160\144\004\028@\176\192\004\183{\001\b\n\001\b\n\192\004\184\000A\001\b\238\001\b\241@\160B@\176/MakeComparableU\144\160\160A@@\144\148\192A\160\176\001\005+!M@@\144\004\003\160B@A",
(* Complex *)"\132\149\166\190\000\000\000\194\000\000\000M\000\000\000\234\000\000\000\229\160\b\000\000<\000\176#add\144\160\160B@@@\176#arg\144\160\160A@@@\176#div\144\160\160B@@@\176#exp\144\160\160A@@@\176#inv\144\160\160A@@@\176#log\144\160\160A@@@\176#mul\144\160\160B@@@\176#neg\144\160\160A@@@\176#pow\144\160\160B@@@\176#sub\144\160\160B@@@\176$conj\144\160\160A@@@\176$norm\144\160\160A@@@\176$sqrt\144\160\160A@@@\176%norm2\144\160\160A@@@\176%polar\144\160\160B@@@A",
(* Hashtbl *)"\132\149\166\190\000\000\001\216\000\000\000\140\000\000\001\206\000\000\001\177\160\b\000\000`\000\176#add\144\160\160C@@@\176#mem\144\160\160B@@@\176$Make\144\160\160A@@@\176$copy\144\160\160A@@@\176$find\144\160\160B@@@\176$fold\144\160\160C@@@\176$hash\144\160\160A@@@\176$iter\144\160\160B@@@\176%clear\144\160\160A@@@\176%reset\144\160\160A@@@\176%stats\144\160\160A@@@\176&create\144\160\160B@@@\176&length\144\160\160A@@\144\148\192A\160\176\001\005\018!h@@\151\176\161@\161$sizeA\160\144\004\t@\176\1925stdlib-406/hashtbl.ml\000|\001\015\142\001\015\157\192\004\002\000|\001\015\142\001\015\163@\160BA\176&remove\144\160\160B@@@\176'replace\144\160\160C@@@\176(find_all\144\160\160B@@@\176(find_opt\144\160\160B@@@\176)randomize\144\160\160A@@@\176*MakeSeeded\144\160\160A@@@\176*hash_param\144\160\160C@@@\176+seeded_hash\144\160\160B@@@\176-is_randomized\144\160\160A@@@\1761seeded_hash_param\144\160\160D@@@\1762filter_map_inplace\144\160\160B@@@A",
(* Js_cast *)"\132\149\166\190\000\000\000\003\000\000\000\001\000\000\000\003\000\000\000\003\160\128A",
Expand Down
4 changes: 2 additions & 2 deletions jscomp/others/belt.ml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)

(** A stdlib shipped with BuckleScript
(** A stdlib shipped with ReScript

This stdlib is still in {i beta} but we encourage you to try it out and
give us feedback.

{b Motivation }

The motivation for creating such library is to provide BuckleScript users a
The motivation for creating such library is to provide ReScript users a
better end-to-end user experience, since the original OCaml stdlib was not
written with JS in mind. Below is a list of areas this lib aims to
improve:
Expand Down
2 changes: 1 addition & 1 deletion jscomp/others/belt_Id.ml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module MakeComparable (M : sig
struct
type identity
type t = M.t
(* see https://github.com/BuckleScript/bucklescript/pull/2589/files/5ef875b7665ee08cfdc59af368fc52bac1fe9130#r173330825 *)
(* see https://github.com/rescript-lang/rescript-compiler/pull/2589/files/5ef875b7665ee08cfdc59af368fc52bac1fe9130#r173330825 *)
let cmp =
let cmp = M.cmp in fun[@bs] a b -> cmp a b
end
Expand Down
2 changes: 1 addition & 1 deletion jscomp/super_errors/super_typecore.ml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ end

(* given type1 is foo => bar => baz(qux) and type 2 is bar => baz(qux), return Some(foo) *)
let rec collect_missing_arguments env type1 type2 = match type1 with
(* why do we use Ctype.matches here? Please see https://github.com/BuckleScript/bucklescript/pull/2554 *)
(* why do we use Ctype.matches here? Please see https://github.com/rescript-lang/rescript-compiler/pull/2554 *)
| {Types.desc=Tarrow (label, argtype, typ, _)} when Ctype.matches env typ type2 ->
Some [(label, argtype)]
| {desc=Tarrow (label, argtype, typ, _)} -> begin
Expand Down
2 changes: 1 addition & 1 deletion lib/4.06.1/bsb.ml
Original file line number Diff line number Diff line change
Expand Up @@ -17187,7 +17187,7 @@ let bsb_main_flags : (string * spec * string) array =
"-theme", String (String_set current_theme),
"The theme for project initialization. \n\
default is basic:\n\
https://github.com/bucklescript/bucklescript/tree/master/jscomp/bsb/templates";
https://github.com/rescript-lang/rescript-compiler/tree/master/jscomp/bsb/templates";

"-regen", unit_set_spec force_regenerate,
"*internal* \n\
Expand Down
Loading