Merge branch 'modular:main' into main

CONTRIBUTING.md

@@ -200,7 +200,7 @@ Library, Mojo examples, or Mojo documentation. This page gives an overview of
 the process. For a more detailed walkthrough, see
 [How to contribute to the Mojo standard library: a step-by-step guide](https://www.modular.com/blog/how-to-contribute-to-mojo-standard-library-a-step-by-step-guide).
 
-**Note:** Pull requests should be submitted against the `nightly` branch,
+**Note:** Pull requests should be submitted against the `main` branch,
 which represents the most recent nightly build.
 
 ### Pull request process
@@ -243,10 +243,10 @@ git fetch upstream
 
 #### Branching off nightly
 
-Make sure to branch off `nightly` to work on your PR:
+Make sure to branch off `main` to work on your PR:
 
 ```bash
-git checkout upstream/nightly
+git checkout upstream/main
 git checkout -b my-fix-pr
 ```
 
@@ -255,20 +255,20 @@ before raising a PR:
 
 ```bash
 git fetch upstream
-git rebase upstream/nightly
+git rebase upstream/main
 ```
 
 #### Getting the nightly Mojo compiler
 
-Now that you're on the nightly branch, you need to install the latest nightly
+Now that you're on the main branch, you need to install the latest nightly
 build.
 
-If you're using [`magic`](https://docs.modular.com/magic), create a new
-project environment with the `max-nightly` channel like this:
+If you're using [`magic`](https://docs.modular.com/magic) (version 0.6.4 or
+higher), create a new project environment like this and it will install the
+latest nightly version of `max` by default:
 
 ```bash
-magic init mojo-nightly --format mojoproject \
-  -c conda-forge -c https://conda.modular.com/max-nightly
+magic init mojo-nightly --format mojoproject
 ```
 
 If you're [using conda](https://docs.modular.com/magic/conda), add the
@@ -299,7 +299,7 @@ when using the stable release!
 
 If your change is one of the improvements described above or it has been
 discussed and agreed upon by the project maintainers, please create a pull
-request into the `nightly` branch.
+request into the `main` branch.
 
 First push your changes:
 
@@ -314,7 +314,7 @@ remote: Create a pull request for 'my-fix-pr' on GitHub by visiting:
 remote:      https://github.com/jackos/mojo/pull/new/my-fix-pr
 ```
 
-Make sure you point it to the `nightly` branch:
+Make sure you point it to the `main` branch:
 
 ![Base Branch](stdlib/docs/images/base-branch.png)
 

README.md

@@ -25,11 +25,11 @@ This repo includes source code for:
 
 This repo has two primary branches:
 
-- The [`main`](https://github.com/modularml/mojo/tree/main) branch, which is in
-sync with the last stable released version of Mojo. Use the examples here if you’re
-using a [release build of Mojo](#latest-released).
+- The [`stable`](https://github.com/modularml/mojo/tree/stable) branch, which
+is in sync with the last stable released version of Mojo. Use the examples
+here if you’re using a [release build of Mojo](#latest-released).
 
-- The [`nightly`](https://github.com/modularml/mojo/tree/nightly) branch, which
+- The [`main`](https://github.com/modularml/mojo/tree/main) branch, which
 is in sync with the Mojo nightly build and subject to breakage. Use this branch
 for [contributions](./CONTRIBUTING.md), or if you're using the latest
 [nightly build of Mojo](#latest-nightly).
@@ -74,16 +74,15 @@ platforms = ["osx-arm64", "linux-aarch64", "linux-64"]
 max = "*"
 ```
 
-And when you clone this repo, switch to the `nightly` branch because the `main`
-branch might not be compatible with nightly builds:
+When you clone this repo, you'll be on the `main` branch by default,
+which includes code matching the latest nightly build:
 
 ```bash
 git clone https://github.com/modularml/mojo.git
 ```
 
-```bash
-git checkout nightly
-```
+If you want to instead see the source from the most recent stable
+release, then you can switch to the `stable` branch.
 
 ## Contributing
 
@@ -92,7 +91,7 @@ issue here](https://github.com/modularml/mojo/issues).
 See [here](./CONTRIBUTING.md) for guidelines on filing good bugs.
 
 We welcome contributions to this repo on the
-[`nightly`](https://github.com/modularml/mojo/tree/nightly)
+[`main`](https://github.com/modularml/mojo/tree/main)
 branch. If you’d like to contribute to Mojo, please first read our [Contributor
 Guide](https://github.com/modularml/mojo/blob/main/CONTRIBUTING.md).
 

docs/changelog-released.md

@@ -3189,7 +3189,7 @@ This release doesn't include any changes to Mojo.
 ### 🔥 Legendary
 
 - The Mojo standard library is now open source! Check out the
-  [README](https://github.com/modular/mojo/blob/nightly/stdlib/README.md)
+  [README](https://github.com/modular/mojo/blob/main/stdlib/README.md)
   for everything you need to get started.
 
 - Structs and other nominal types are now allowed to implicitly conform to

docs/changelog.md

@@ -100,6 +100,8 @@ what we publish.
 
 ### Standard library changes
 
+- Add a new `validate` parameter to the `b64decode()` function.
+
 - The free floating functions for constructing different types have been
   deprecated for actual constructors: