From 0ea56025ec86506ef91281b69e2e9421e9ab8769 Mon Sep 17 00:00:00 2001 From: Padraic Fanning Date: Wed, 15 Sep 2021 17:54:54 -0400 Subject: [PATCH] Replace `master` with `main` Fixes #3067 --- .github/workflows/ci.yaml | 2 +- README.md | 2 +- bytecode/src/lib.rs | 2 +- compiler/src/compile.rs | 2 +- compiler/src/lib.rs | 2 +- compiler/src/symboltable.rs | 6 +++--- derive/src/lib.rs | 2 +- extra_tests/snippets/stdlib_imghdr.py | 2 +- parser/src/lib.rs | 2 +- vm/src/builtins/function.rs | 2 +- vm/src/exceptions.rs | 2 +- vm/src/lib.rs | 2 +- wasm/README.md | 4 ++-- wasm/lib/Cargo.toml | 2 +- wasm/lib/README.md | 2 +- wasm/notebook/src/index.ejs | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a6b4731249..03fc352f6f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ on: push: - branches: [master, release] + branches: [main, release] pull_request: name: CI diff --git a/README.md b/README.md index 1feb36e760..4f7a627da4 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Python-3 (CPython >= 3.8.0) Interpreter written in Rust :snake: :scream: :metal:. [![Build Status](https://github.com/RustPython/RustPython/workflows/CI/badge.svg)](https://github.com/RustPython/RustPython/actions?query=workflow%3ACI) -[![codecov](https://codecov.io/gh/RustPython/RustPython/branch/master/graph/badge.svg)](https://codecov.io/gh/RustPython/RustPython) +[![codecov](https://codecov.io/gh/RustPython/RustPython/branch/main/graph/badge.svg)](https://codecov.io/gh/RustPython/RustPython) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) [![Contributors](https://img.shields.io/github/contributors/RustPython/RustPython.svg)](https://github.com/RustPython/RustPython/graphs/contributors) [![Gitter](https://badges.gitter.im/RustPython/Lobby.svg)](https://gitter.im/rustpython/Lobby) diff --git a/bytecode/src/lib.rs b/bytecode/src/lib.rs index 213687651c..c6604944e6 100644 --- a/bytecode/src/lib.rs +++ b/bytecode/src/lib.rs @@ -1,7 +1,7 @@ //! Implement python as a virtual machine with bytecodes. This module //! implements bytecode structure. -#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")] +#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")] #![doc(html_root_url = "https://docs.rs/rustpython-bytecode/")] use bitflags::bitflags; diff --git a/compiler/src/compile.rs b/compiler/src/compile.rs index 4dd9e3976c..0ee81d35af 100644 --- a/compiler/src/compile.rs +++ b/compiler/src/compile.rs @@ -2,7 +2,7 @@ //! Take an AST and transform it into bytecode //! //! Inspirational code: -//! https://github.com/python/cpython/blob/master/Python/compile.c +//! https://github.com/python/cpython/blob/main/Python/compile.c //! https://github.com/micropython/micropython/blob/master/py/compile.c use crate::ir::{self, CodeInfo}; diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs index 3116547de3..3e3aca8f32 100644 --- a/compiler/src/lib.rs +++ b/compiler/src/lib.rs @@ -1,5 +1,5 @@ //! Compile a Python AST or source code into bytecode consumable by RustPython. -#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")] +#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")] #![doc(html_root_url = "https://docs.rs/rustpython-compiler/")] #[macro_use] diff --git a/compiler/src/symboltable.rs b/compiler/src/symboltable.rs index f5cdde219c..c0fd9a22b1 100644 --- a/compiler/src/symboltable.rs +++ b/compiler/src/symboltable.rs @@ -4,7 +4,7 @@ This ensures that global and nonlocal keywords are picked up. Then the compiler can use the symbol table to generate proper load and store instructions for names. -Inspirational file: https://github.com/python/cpython/blob/master/Python/symtable.c +Inspirational file: https://github.com/python/cpython/blob/main/Python/symtable.c */ use crate::error::{CompileError, CompileErrorType}; @@ -196,7 +196,7 @@ impl std::fmt::Debug for SymbolTable { } /* Perform some sort of analysis on nonlocals, globals etc.. - See also: https://github.com/python/cpython/blob/master/Python/symtable.c#L410 + See also: https://github.com/python/cpython/blob/main/Python/symtable.c#L410 */ fn analyze_symbol_table(symbol_table: &mut SymbolTable) -> SymbolTableResult { let mut analyzer = SymbolTableAnalyzer::default(); @@ -760,7 +760,7 @@ impl SymbolTableBuilder { value, simple, } => { - // https://github.com/python/cpython/blob/master/Python/symtable.c#L1233 + // https://github.com/python/cpython/blob/main/Python/symtable.c#L1233 match &target.node { ast::ExprKind::Name { id, .. } if *simple => { self.register_name(id, SymbolUsage::AnnotationAssigned, location)?; diff --git a/derive/src/lib.rs b/derive/src/lib.rs index de0983cfe9..a847f01e62 100644 --- a/derive/src/lib.rs +++ b/derive/src/lib.rs @@ -1,5 +1,5 @@ #![recursion_limit = "128"] -#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")] +#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")] #![doc(html_root_url = "https://docs.rs/rustpython-derive/")] extern crate proc_macro; diff --git a/extra_tests/snippets/stdlib_imghdr.py b/extra_tests/snippets/stdlib_imghdr.py index 00632f8861..5ca524e269 100644 --- a/extra_tests/snippets/stdlib_imghdr.py +++ b/extra_tests/snippets/stdlib_imghdr.py @@ -1,5 +1,5 @@ # unittest for modified imghdr.py -# Should be replace it into https://github.com/python/cpython/blob/master/Lib/test/test_imghdr.py +# Should be replace it into https://github.com/python/cpython/blob/main/Lib/test/test_imghdr.py import os import imghdr diff --git a/parser/src/lib.rs b/parser/src/lib.rs index 80030e61b9..6cd6a1eaf2 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -15,7 +15,7 @@ //! //! ``` -#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")] +#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")] #![doc(html_root_url = "https://docs.rs/rustpython-parser/")] #[macro_use] diff --git a/vm/src/builtins/function.rs b/vm/src/builtins/function.rs index b24cb8faf6..cf725e3be7 100644 --- a/vm/src/builtins/function.rs +++ b/vm/src/builtins/function.rs @@ -81,7 +81,7 @@ impl PyFunction { // the proper variables keeping into account default values // and starargs and kwargs. // See also: PyEval_EvalCodeWithName in cpython: - // https://github.com/python/cpython/blob/master/Python/ceval.c#L3681 + // https://github.com/python/cpython/blob/main/Python/ceval.c#L3681 let mut fastlocals = frame.fastlocals.lock(); diff --git a/vm/src/exceptions.rs b/vm/src/exceptions.rs index 1870cfd965..c598bc9e90 100644 --- a/vm/src/exceptions.rs +++ b/vm/src/exceptions.rs @@ -208,7 +208,7 @@ fn print_source_line( filename: &str, lineno: usize, ) -> Result<(), W::Error> { - // TODO: use io.open() method instead, when available, according to https://github.com/python/cpython/blob/master/Python/traceback.c#L393 + // TODO: use io.open() method instead, when available, according to https://github.com/python/cpython/blob/main/Python/traceback.c#L393 // TODO: support different encodings let file = match File::open(filename) { Ok(file) => file, diff --git a/vm/src/lib.rs b/vm/src/lib.rs index 8807d7c2f1..87234f4a2e 100644 --- a/vm/src/lib.rs +++ b/vm/src/lib.rs @@ -15,7 +15,7 @@ // we want to mirror python naming conventions when defining python structs, so that does mean // uppercase acronyms, e.g. TextIOWrapper instead of TextIoWrapper #![allow(clippy::upper_case_acronyms)] -#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/master/logo.png")] +#![doc(html_logo_url = "https://raw.githubusercontent.com/RustPython/RustPython/main/logo.png")] #![doc(html_root_url = "https://docs.rs/rustpython-vm/")] #[cfg(feature = "flame-it")] diff --git a/wasm/README.md b/wasm/README.md index 8834249008..de71e66045 100644 --- a/wasm/README.md +++ b/wasm/README.md @@ -62,6 +62,6 @@ for the crate and webpack. ## Updating the demo If you wish to update the WebAssembly demo, -[open a pull request](https://github.com/RustPython/RustPython/compare/release...master) -to merge `master` into the `release` branch. This will trigger a Travis build +[open a pull request](https://github.com/RustPython/RustPython/compare/release...main) +to merge `main` into the `release` branch. This will trigger a Travis build that updates the demo page. diff --git a/wasm/lib/Cargo.toml b/wasm/lib/Cargo.toml index 2b618619ab..28db01f958 100644 --- a/wasm/lib/Cargo.toml +++ b/wasm/lib/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.2" authors = ["RustPython Team"] license = "MIT" description = "A Python-3 (CPython >= 3.5.0) Interpreter written in Rust, compiled to WASM" -repository = "https://github.com/RustPython/RustPython/tree/master/wasm/lib" +repository = "https://github.com/RustPython/RustPython/tree/main/wasm/lib" edition = "2018" [lib] diff --git a/wasm/lib/README.md b/wasm/lib/README.md index f8f847f277..7d2d330d08 100644 --- a/wasm/lib/README.md +++ b/wasm/lib/README.md @@ -2,7 +2,7 @@ A Python-3 (CPython >= 3.8.0) Interpreter written in Rust. -[![Build Status](https://travis-ci.org/RustPython/RustPython.svg?branch=master)](https://travis-ci.org/RustPython/RustPython) +[![Build Status](https://travis-ci.org/RustPython/RustPython.svg?branch=main)](https://travis-ci.org/RustPython/RustPython) [![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) [![Contributors](https://img.shields.io/github/contributors/RustPython/RustPython.svg)](https://github.com/RustPython/RustPython/graphs/contributors) [![Gitter](https://badges.gitter.im/RustPython/Lobby.svg)](https://gitter.im/rustpython/Lobby) diff --git a/wasm/notebook/src/index.ejs b/wasm/notebook/src/index.ejs index 1142389942..79274cba03 100644 --- a/wasm/notebook/src/index.ejs +++ b/wasm/notebook/src/index.ejs @@ -14,7 +14,7 @@
RustPython 🐍 😱 🤘
- how this works + how this works github