From 0434d203801961e2289b04dac99e337440f3295a Mon Sep 17 00:00:00 2001 From: Matthew Pope <81593196+popematt@users.noreply.github.com> Date: Tue, 24 Jan 2023 17:15:01 -0800 Subject: [PATCH] Update all references to the GitHub organization: amzn -> amazon-ion (#462) --- .github/workflows/coverage.yml | 2 +- .github/workflows/rust.yml | 4 ++-- .gitmodules | 4 ++-- CONTRIBUTING.md | 6 +++--- Cargo.toml | 4 ++-- README.md | 12 ++++++------ ion-hash/Cargo.toml | 4 ++-- ion-hash/README.md | 6 +++--- ion-hash/src/lib.rs | 2 +- ion-hash/src/type_qualifier.rs | 4 ++-- src/binary/decimal.rs | 2 +- src/binary/header.rs | 4 ++-- src/binary/int.rs | 2 +- src/binary/non_blocking/binary_buffer.rs | 12 ++++++------ src/binary/non_blocking/raw_binary_reader.rs | 2 +- src/binary/non_blocking/type_descriptor.rs | 2 +- src/binary/raw_binary_reader.rs | 2 +- src/binary/timestamp.rs | 2 +- src/binary/type_code.rs | 2 +- src/binary/uint.rs | 4 ++-- src/binary/var_int.rs | 4 ++-- src/binary/var_uint.rs | 4 ++-- src/catalog.rs | 2 +- src/data_source.rs | 16 ++++++++-------- src/lib.rs | 2 +- src/raw_reader.rs | 10 +++++----- src/reader.rs | 2 +- src/shared_symbol_table.rs | 2 +- src/stream_reader.rs | 8 ++++---- src/text/non_blocking/raw_text_reader.rs | 4 ++-- src/text/parsers/containers.rs | 4 ++-- src/text/parsers/mod.rs | 2 +- src/text/parsers/text_support.rs | 2 +- src/text/parsers/top_level.rs | 2 +- src/text/raw_text_writer.rs | 4 ++-- src/text/text_writer.rs | 2 +- src/types/mod.rs | 4 ++-- tests/reexport_external.rs | 2 +- 38 files changed, 79 insertions(+), 79 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1c29ff59..2418ad9e 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} # We want to run on external PRs, but not on internal ones as push automatically builds # H/T: https://github.com/Dart-Code/Dart-Code/commit/612732d5879730608baa9622bf7f5e5b7b51ae65 - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amzn/ion-rust' + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-rust' strategy: matrix: os: [ubuntu-latest] diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e03835fb..902fd2d6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -8,14 +8,14 @@ jobs: runs-on: ${{ matrix.os }} # We want to run on external PRs, but not on internal ones as push automatically builds # H/T: https://github.com/Dart-Code/Dart-Code/commit/612732d5879730608baa9622bf7f5e5b7b51ae65 - if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amzn/ion-rust' + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-rust' strategy: matrix: # In 2022-01-11, GitHub Actions changed the `windows-latest` virtual environment alias so # that it stopped pointing to `windows-2019` and began pointing to `windows-2022` instead. # The pipeline needs to be updated to support the new edition of Windows Server. In the # meantime, the build only tests Windows Server 2019. - # See https://github.com/amzn/ion-rust/issues/353 + # See https://github.com/amazon-ion/ion-rust/issues/353 os: [ubuntu-latest, windows-2019, macos-latest] steps: diff --git a/.gitmodules b/.gitmodules index fd4007c3..5da3132c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "ion-tests"] path = ion-tests - url = https://github.com/amzn/ion-tests.git + url = https://github.com/amazon-ion/ion-tests.git [submodule "ion-hash-test"] path = ion-hash/ion-hash-test - url = https://github.com/amzn/ion-hash-test.git + url = https://github.com/amazon-ion/ion-hash-test.git diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c39733c..ade9e413 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution. We welcome you to use the GitHub issue tracker to report bugs or suggest features. -When filing an issue, please check [existing open](https://github.com/amzn/ion-rust/issues), or [recently closed](https://github.com/amzn/ion-rust/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already +When filing an issue, please check [existing open](https://github.com/amazon-ion/ion-rust/issues), or [recently closed](https://github.com/amazon-ion/ion-rust/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already reported the issue. Please try to include as much information as you can. Details like these are incredibly useful: * A reproducible test case or series of steps @@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu ## Finding contributions to work on -Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amzn/ion-rust/labels/help%20wanted) issues is a great place to start. +Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amazon-ion/ion-rust/labels/help%20wanted) issues is a great place to start. ## Code of Conduct @@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif ## Licensing -See the [LICENSE](https://github.com/amzn/ion-rust/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. +See the [LICENSE](https://github.com/amazon-ion/ion-rust/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes. diff --git a/Cargo.toml b/Cargo.toml index 9b4a2d88..3683a9e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,8 +2,8 @@ name = "ion-rs" authors = ["Amazon Ion Team "] description = "Implementation of Amazon Ion" -homepage = "https://github.com/amzn/ion-rust" -repository = "https://github.com/amzn/ion-rust" +homepage = "https://github.com/amazon-ion/ion-rust" +repository = "https://github.com/amazon-ion/ion-rust" license = "Apache-2.0" readme = "README.md" keywords = ["ion", "parser", "json", "format", "serde"] diff --git a/README.md b/README.md index d873f6bb..9e21b746 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ [![Crate](https://img.shields.io/crates/v/ion-rs.svg)](https://crates.io/crates/ion-rs) [![Docs](https://docs.rs/ion-rs/badge.svg)](https://docs.rs/ion-rs) -[![License](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/amzn/ion-rust/blob/main/LICENSE) -[![CI Build](https://github.com/amzn/ion-rust/workflows/CI%20Build/badge.svg)](https://github.com/amzn/ion-rust/actions?query=workflow%3A%22CI+Build%22) -[![codecov](https://codecov.io/gh/amzn/ion-rust/branch/main/graph/badge.svg?token=GB20BDE48S)](https://codecov.io/gh/amzn/ion-rust) +[![License](https://img.shields.io/hexpm/l/plug.svg)](https://github.com/amazon-ion/ion-rust/blob/main/LICENSE) +[![CI Build](https://github.com/amazon-ion/ion-rust/workflows/CI%20Build/badge.svg)](https://github.com/amazon-ion/ion-rust/actions?query=workflow%3A%22CI+Build%22) +[![codecov](https://codecov.io/gh/amazon-ion/ion-rust/branch/main/graph/badge.svg?token=GB20BDE48S)](https://codecov.io/gh/amazon-ion/ion-rust) A Rust implementation of the [Amazon Ion][spec] data format. @@ -16,7 +16,7 @@ This project uses a submodule to pull in [Ion Tests][ion-tests]. The easiest wa everything in is to clone the repository recursively: ```bash -$ git clone --recursive https://github.com/amzn/ion-rust +$ git clone --recursive https://github.com/amazon-ion/ion-rust ``` You can also initialize the submodules as follows: @@ -37,6 +37,6 @@ Running all tests for `ion-rust`: $ cargo test --workspace ``` -[spec]: https://amzn.github.io/ion-docs/docs/spec.html -[ion-tests]: https://github.com/amzn/ion-tests +[spec]: https://amazon-ion.github.io/ion-docs/docs/spec.html +[ion-tests]: https://github.com/amazon-ion/ion-tests [bindgen-req]: https://rust-lang.github.io/rust-bindgen/requirements.html diff --git a/ion-hash/Cargo.toml b/ion-hash/Cargo.toml index 8aa371f4..867e18a2 100644 --- a/ion-hash/Cargo.toml +++ b/ion-hash/Cargo.toml @@ -2,8 +2,8 @@ name = "ion-hash" authors = ["Amazon Ion Team "] description = "Ion Hash" -homepage = "https://github.com/amzn/ion-rust" -repository = "https://github.com/amzn/ion-rust" +homepage = "https://github.com/amazon-ion/ion-rust" +repository = "https://github.com/amazon-ion/ion-rust" license = "Apache-2.0" readme = "README.md" keywords = ["ion", "parser", "json", "format", "hash"] diff --git a/ion-hash/README.md b/ion-hash/README.md index 1a1fafbd..962befa8 100644 --- a/ion-hash/README.md +++ b/ion-hash/README.md @@ -3,7 +3,7 @@ [![Crate](https://img.shields.io/crates/v/ion-hash.svg)](https://crates.io/crates/ion-hash) [![Docs](https://docs.rs/ion-hash/badge.svg)](https://docs.rs/ion-hash) [![License](https://img.shields.io/crates/l/ion-hash)](https://crates.io/crates/ion-hash) -[![CI Build](https://github.com/amzn/ion-rust/workflows/CI%20Build/badge.svg)](https://github.com/amzn/ion-rust/actions?query=workflow%3A%22CI+Build%22) +[![CI Build](https://github.com/amazon-ion/ion-rust/workflows/CI%20Build/badge.svg)](https://github.com/amazon-ion/ion-rust/actions?query=workflow%3A%22CI+Build%22) A Rust implementation of [Ion Hash][spec]. @@ -14,6 +14,6 @@ A Rust implementation of [Ion Hash][spec]. See [Ion Rust][ion-rust] for details. This crate is currently developed in concert with Ion Rust as a [Cargo workspace][cargo-workspace]. -[ion-rust]: https://github.com/amzn/ion-rust -[spec]: https://amzn.github.io/ion-hash/docs/spec.html +[ion-rust]: https://github.com/amazon-ion/ion-rust +[spec]: https://amazon-ion.github.io/ion-hash/docs/spec.html [cargo-workspace]: https://doc.rust-lang.org/cargo/reference/workspaces.html diff --git a/ion-hash/src/lib.rs b/ion-hash/src/lib.rs index 30442700..8ef4b26b 100644 --- a/ion-hash/src/lib.rs +++ b/ion-hash/src/lib.rs @@ -1,6 +1,6 @@ // Copyright Amazon.com, Inc. or its affiliates. -//! Implements the [Ion Hash specification](https://amzn.github.io/ion-hash/docs/spec.html) +//! Implements the [Ion Hash specification](https://amazon-ion.github.io/ion-hash/docs/spec.html) //! //! ## Examples //! ```rust diff --git a/ion-hash/src/type_qualifier.rs b/ion-hash/src/type_qualifier.rs index 3722ce8b..8b99a5ee 100644 --- a/ion-hash/src/type_qualifier.rs +++ b/ion-hash/src/type_qualifier.rs @@ -4,11 +4,11 @@ use std::slice; ///! Implements "type qualifiers" (TQ) as per the [spec][spec]. ///! -///! [spec]: https://amzn.github.io/ion-hash/docs/spec.html. +///! [spec]: https://amazon-ion.github.io/ion-hash/docs/spec.html. use ion_rs::types::integer::Integer; ///! Implements "type qualifiers" (TQ) as per the [spec][spec]. ///! -///! [spec]: https://amzn.github.io/ion-hash/docs/spec.html. +///! [spec]: https://amazon-ion.github.io/ion-hash/docs/spec.html. use ion_rs::{ binary::IonTypeCode, types::{decimal::Decimal, timestamp::Timestamp}, diff --git a/src/binary/decimal.rs b/src/binary/decimal.rs index 98fab9c5..ddc02365 100644 --- a/src/binary/decimal.rs +++ b/src/binary/decimal.rs @@ -30,7 +30,7 @@ const DECIMAL_POSITIVE_ZERO: Decimal = Decimal { /// Provides support to write [`Decimal`] into [Ion binary]. /// -/// [Ion binary]: https://amzn.github.io/ion-docs/docs/binary.html#5-decimal +/// [Ion binary]: https://amazon-ion.github.io/ion-docs/docs/binary.html#5-decimal pub trait DecimalBinaryEncoder { /// Encodes the content of a [`Decimal`] as per the Ion binary encoding. /// Returns the length of the encoded bytes. diff --git a/src/binary/header.rs b/src/binary/header.rs index 15b29445..e33519f8 100644 --- a/src/binary/header.rs +++ b/src/binary/header.rs @@ -9,7 +9,7 @@ use crate::{ /// Contains all of the information that can be extracted from the one-octet type descriptor /// found at the beginning of each value in a binary Ion stream. /// For more information, consult the -/// [Typed Value Formats](http://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats) +/// [Typed Value Formats](https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats) /// section of the binary Ion spec. #[derive(Copy, Clone, Debug)] pub(crate) struct Header { @@ -49,7 +49,7 @@ impl Header { /// All values stored in the table are either an `Err(IonError::DecodingError)` or an /// `Ok(Some(IonValueHeader))`. // TODO: Define the jump table as a static constant at compile time to avoid recalculating it. -// https://github.com/amzn/ion-rust/issues/4 +// https://github.com/amazon-ion/ion-rust/issues/4 pub(crate) fn create_header_byte_jump_table() -> Vec>> { let mut header_jump_table = Vec::with_capacity(256); for byte_value in 0..=255 { diff --git a/src/binary/int.rs b/src/binary/int.rs index 5c04b45a..78af38e2 100644 --- a/src/binary/int.rs +++ b/src/binary/int.rs @@ -18,7 +18,7 @@ const INT_STACK_BUFFER_SIZE: usize = 16; const MAX_INT_SIZE_IN_BYTES: usize = 2048; /// Represents a fixed-length signed integer. See the -/// [UInt and Int Fields](http://amzn.github.io/ion-docs/docs/binary.html#uint-and-int-fields) +/// [UInt and Int Fields](https://amazon-ion.github.io/ion-docs/docs/binary.html#uint-and-int-fields) /// section of the binary Ion spec for more details. #[derive(Debug)] pub struct DecodedInt { diff --git a/src/binary/non_blocking/binary_buffer.rs b/src/binary/non_blocking/binary_buffer.rs index 47e3d2ed..05eab683 100644 --- a/src/binary/non_blocking/binary_buffer.rs +++ b/src/binary/non_blocking/binary_buffer.rs @@ -131,7 +131,7 @@ impl> BinaryBuffer { /// returns an `Ok(_)` containing a `(major, minor)` version tuple and consumes the /// source bytes. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#value-streams + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#value-streams pub fn read_ivm(&mut self) -> IonResult<(u8, u8)> { let bytes = self .peek_n_bytes(IVM.len()) @@ -150,7 +150,7 @@ impl> BinaryBuffer { /// Reads a `VarUInt` encoding primitive from the beginning of the buffer. If it is successful, /// returns an `Ok(_)` containing its [VarUInt] representation and consumes the source bytes. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields pub fn read_var_uint(&mut self) -> IonResult { const BITS_PER_ENCODED_BYTE: usize = 7; const STORAGE_SIZE_IN_BITS: usize = mem::size_of::() * 8; @@ -188,7 +188,7 @@ impl> BinaryBuffer { /// Reads a `VarInt` encoding primitive from the beginning of the buffer. If it is successful, /// returns an `Ok(_)` containing its [VarInt] representation and consumes the source bytes. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields pub fn read_var_int(&mut self) -> IonResult { const BITS_PER_ENCODED_BYTE: usize = 7; const STORAGE_SIZE_IN_BITS: usize = mem::size_of::() * 8; @@ -260,7 +260,7 @@ impl> BinaryBuffer { /// successful, returns an `Ok(_)` containing its [DecodedUInt] representation and consumes the /// source bytes. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#uint-and-int-fields + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#uint-and-int-fields pub fn read_uint(&mut self, length: usize) -> IonResult { if length <= mem::size_of::() { return self.read_small_uint(length); @@ -317,7 +317,7 @@ impl> BinaryBuffer { /// successful, returns an `Ok(_)` containing its [DecodedInt] representation and consumes the /// source bytes. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#uint-and-int-fields + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#uint-and-int-fields pub fn read_int(&mut self, length: usize) -> IonResult { if length == 0 { return Ok(DecodedInt::new(Integer::I64(0), false, 0)); @@ -373,7 +373,7 @@ impl> BinaryBuffer { /// Reads a `NOP` encoding primitive from the buffer. If it is successful, returns an `Ok(_)` /// containing the number of bytes that were consumed. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#nop-pad + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#nop-pad #[inline(never)] // NOP padding is not widely used in Ion 1.0, in part because many writer implementations do not // expose the ability to write them. As such, this method has been marked `inline(never)` to diff --git a/src/binary/non_blocking/raw_binary_reader.rs b/src/binary/non_blocking/raw_binary_reader.rs index 2537b5c3..8594a6dd 100644 --- a/src/binary/non_blocking/raw_binary_reader.rs +++ b/src/binary/non_blocking/raw_binary_reader.rs @@ -170,7 +170,7 @@ impl EncodedValue { /// Returns the number of bytes used to encode the series of VarUInt annotation symbol IDs, if /// any. /// - /// See: https://amzn.github.io/ion-docs/docs/binary.html#annotations + /// See: https://amazon-ion.github.io/ion-docs/docs/binary.html#annotations fn annotations_sequence_length(&self) -> Option { if self.annotations_header_length == 0 { return None; diff --git a/src/binary/non_blocking/type_descriptor.rs b/src/binary/non_blocking/type_descriptor.rs index 920f01bd..a0d357af 100644 --- a/src/binary/non_blocking/type_descriptor.rs +++ b/src/binary/non_blocking/type_descriptor.rs @@ -6,7 +6,7 @@ use crate::{ /// Contains all of the information that can be extracted from the one-octet type descriptor /// found at the beginning of each value, annotations wrapper, IVM, or NOP in a binary Ion stream. /// For more information, consult the -/// [Typed Value Formats](http://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats) +/// [Typed Value Formats](https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats) /// section of the binary Ion spec. #[derive(Copy, Clone, Debug, PartialEq)] pub(crate) struct TypeDescriptor { diff --git a/src/binary/raw_binary_reader.rs b/src/binary/raw_binary_reader.rs index 02832f94..04f1697e 100644 --- a/src/binary/raw_binary_reader.rs +++ b/src/binary/raw_binary_reader.rs @@ -227,7 +227,7 @@ where /* CursorState is broken out from the BinaryIonCursor struct to allow it to be cloned * or replaced as part of a seek operation. - * See: https://github.com/amzn/ion-rust/issues/21 + * See: https://github.com/amazon-ion/ion-rust/issues/21 */ #[derive(Clone, Debug)] pub struct CursorState { diff --git a/src/binary/timestamp.rs b/src/binary/timestamp.rs index 4a57fe00..cdfc7ab2 100644 --- a/src/binary/timestamp.rs +++ b/src/binary/timestamp.rs @@ -21,7 +21,7 @@ const MAX_TIMESTAMP_LENGTH: usize = 32; /// Provides support to write [`Timestamp`] into [Ion binary]. /// -/// [Ion binary]: https://amzn.github.io/ion-docs/docs/binary.html#6-timestamp +/// [Ion binary]: https://amazon-ion.github.io/ion-docs/docs/binary.html#6-timestamp pub trait TimestampBinaryEncoder { /// Encodes the content of a [`Timestamp`] as per the Ion binary encoding. /// Returns the length of the encoded bytes. diff --git a/src/binary/type_code.rs b/src/binary/type_code.rs index 9495b881..552afb29 100644 --- a/src/binary/type_code.rs +++ b/src/binary/type_code.rs @@ -12,7 +12,7 @@ use crate::types::IonType; /// * Whether the next type code is reserved. /// /// See the -/// [Typed Value Formats](http://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats) +/// [Typed Value Formats](https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats) /// section of the spec for more information. #[derive(Debug, PartialEq, Eq, Copy, Clone)] pub enum IonTypeCode { diff --git a/src/binary/uint.rs b/src/binary/uint.rs index 8a8d99a9..e54de0fc 100644 --- a/src/binary/uint.rs +++ b/src/binary/uint.rs @@ -12,7 +12,7 @@ const UINT_STACK_BUFFER_SIZE: usize = 16; const MAX_UINT_SIZE_IN_BYTES: usize = 2048; /// Represents a fixed-length unsigned integer. See the -/// [UInt and Int Fields](http://amzn.github.io/ion-docs/docs/binary.html#uint-and-int-fields) +/// [UInt and Int Fields](https://amazon-ion.github.io/ion-docs/docs/binary.html#uint-and-int-fields) /// section of the binary Ion spec for more details. #[derive(Debug)] pub struct DecodedUInt { @@ -142,7 +142,7 @@ pub enum UIntBeBytes { /// octets are not part of the representation. See the [spec] for more /// information. /// -/// [spec]: https://amzn.github.io/ion-docs/docs/binary.html#uint-and-int-fields +/// [spec]: https://amazon-ion.github.io/ion-docs/docs/binary.html#uint-and-int-fields #[derive(Clone, Debug, PartialEq, Eq)] pub struct EncodedUInt { be_bytes: UIntBeBytes, diff --git a/src/binary/var_int.rs b/src/binary/var_int.rs index 3f51b342..824ece58 100644 --- a/src/binary/var_int.rs +++ b/src/binary/var_int.rs @@ -6,7 +6,7 @@ use std::mem; // ion_rust does not currently support reading variable length integers of truly arbitrary size. // These type aliases will simplify the process of changing the data types used to represent each // VarInt's magnitude and byte length in the future. -// See: https://github.com/amzn/ion-rust/issues/7 +// See: https://github.com/amazon-ion/ion-rust/issues/7 type VarIntStorage = i64; type VarIntSizeStorage = usize; @@ -35,7 +35,7 @@ pub struct VarInt { const MAGNITUDE_BITS_IN_FINAL_BYTE: usize = 6; /// Represents a variable-length signed integer. See the -/// [VarUInt and VarInt Fields](amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields) +/// [VarUInt and VarInt Fields](https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields) /// section of the binary Ion spec for more details. impl VarInt { pub(crate) fn new(value: i64, is_negative: bool, size_in_bytes: usize) -> Self { diff --git a/src/binary/var_uint.rs b/src/binary/var_uint.rs index c36f64f5..00532414 100644 --- a/src/binary/var_uint.rs +++ b/src/binary/var_uint.rs @@ -6,7 +6,7 @@ use std::mem; // ion_rust does not currently support reading variable length integers of truly arbitrary size. // These type aliases will simplify the process of changing the data types used to represent each // VarUInt's magnitude and byte length in the future. -// See: https://github.com/amzn/ion-rust/issues/7 +// See: https://github.com/amazon-ion/ion-rust/issues/7 const BITS_PER_ENCODED_BYTE: usize = 7; const STORAGE_SIZE_IN_BITS: usize = mem::size_of::() * 8; @@ -16,7 +16,7 @@ const LOWER_7_BITMASK: u8 = 0b0111_1111; const HIGHEST_BIT_VALUE: u8 = 0b1000_0000; /// Represents a variable-length unsigned integer. See the -/// [VarUInt and VarInt Fields](amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields) +/// [VarUInt and VarInt Fields](https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields) /// section of the binary Ion spec for more details. #[derive(Debug)] pub struct VarUInt { diff --git a/src/catalog.rs b/src/catalog.rs index 54b243f0..adc57ed0 100644 --- a/src/catalog.rs +++ b/src/catalog.rs @@ -5,7 +5,7 @@ use std::collections::{BTreeMap, HashMap}; /// A Catalog is a collection of Shared Symbol Tables. /// For more information about the concept of a catalog, -/// see [the `symbols` section of the specification](https://amzn.github.io/ion-docs/docs/symbols.html#the-catalog). +/// see [the `symbols` section of the specification](https://amazon-ion.github.io/ion-docs/docs/symbols.html#the-catalog). pub trait Catalog { /// Returns the Shared Symbol Table with given table name /// If a table with the given name doesn't exists or if the table name is an empty string diff --git a/src/data_source.rs b/src/data_source.rs index 508cb8bf..fbe0287c 100644 --- a/src/data_source.rs +++ b/src/data_source.rs @@ -6,7 +6,7 @@ use crate::result::{decoding_error, IonError, IonResult}; /// Optimized read operations for parsing Ion. /// -/// The [binary Ion spec](amzn.github.io/ion-docs/docs/binary.html) calls for a number of reading +/// The [binary Ion spec](https://amazon-ion.github.io/ion-docs/docs/binary.html) calls for a number of reading /// patterns, including: /// /// * Type descriptor octets (value headers) require that a single byte be read from input. @@ -29,7 +29,7 @@ pub trait IonDataSource: BufRead { let buffer = self.fill_buf()?; if buffer.is_empty() { // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 return decoding_error("Unexpected end of stream."); } let bytes_in_buffer = buffer.len(); @@ -71,7 +71,7 @@ pub trait IonDataSource: BufRead { if number_of_buffered_bytes == 0 { // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 return decoding_error("Unexpected end of stream."); } @@ -115,7 +115,7 @@ pub trait IonDataSource: BufRead { // If the buffer is still empty, we've run out of data. if buffer.is_empty() && length > 0 { // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 return decoding_error("Unexpected end of stream."); } @@ -145,7 +145,7 @@ pub trait IonDataSource: BufRead { Ok(()) => slice_processor(buffer), Err(ref e) if e.kind() == std::io::ErrorKind::UnexpectedEof => // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 { decoding_error("Unexpected end of stream.") } @@ -218,7 +218,7 @@ mod tests { let result = data_source.skip_bytes(42); // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 assert!(matches!(result, Err(IonError::DecodingError { .. }))); } @@ -236,7 +236,7 @@ mod tests { let result = data_source.read_next_byte_while(processor); // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 assert!(matches!(result, Err(IonError::DecodingError { .. }))); } @@ -256,7 +256,7 @@ mod tests { ); // TODO: IonResult should have a distinct `IncompleteData` error case - // https://github.com/amzn/ion-rust/issues/299 + // https://github.com/amazon-ion/ion-rust/issues/299 assert!(matches!(result, Err(IonError::DecodingError { .. }))); } } diff --git a/src/lib.rs b/src/lib.rs index b30e4501..b7f63e21 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -57,7 +57,7 @@ pub use result::IonResult; /// Re-exports of third party dependencies that are part of our public API. /// -/// See also: +/// See also: pub mod external { pub use bigdecimal; } diff --git a/src/raw_reader.rs b/src/raw_reader.rs index ced94ba6..b238686a 100644 --- a/src/raw_reader.rs +++ b/src/raw_reader.rs @@ -22,7 +22,7 @@ where /// Note: this implementation contains some methods that are not object safe and so cannot be /// invoked. For the moment, calling these methods via dynamic dispatch will result in a /// panic. Longer-term, they will be replaced by object safe methods. -/// See: +/// See: impl IonReader for Box { type Item = RawStreamItem; type Symbol = RawSymbolToken; @@ -93,7 +93,7 @@ impl IonReader for Box { Self: Sized, F: FnOnce(&str) -> U, { - todo!("Cannot use `map_string` via dynamic dispatch. Use `read_string` instead. See: https://github.com/amzn/ion-rust/issues/335") + todo!("Cannot use `map_string` via dynamic dispatch. Use `read_string` instead. See: https://github.com/amazon-ion/ion-rust/issues/335") } fn map_string_bytes(&mut self, _f: F) -> IonResult @@ -101,7 +101,7 @@ impl IonReader for Box { Self: Sized, F: FnOnce(&[u8]) -> U, { - todo!("Cannot use `map_string_bytes` via dynamic dispatch. Use `read_string` instead. See: https://github.com/amzn/ion-rust/issues/335") + todo!("Cannot use `map_string_bytes` via dynamic dispatch. Use `read_string` instead. See: https://github.com/amazon-ion/ion-rust/issues/335") } fn read_symbol(&mut self) -> IonResult { @@ -117,7 +117,7 @@ impl IonReader for Box { Self: Sized, F: FnOnce(&[u8]) -> U, { - todo!("Cannot use `map_blob` via dynamic dispatch. Use `read_blob` instead. See: https://github.com/amzn/ion-rust/issues/335") + todo!("Cannot use `map_blob` via dynamic dispatch. Use `read_blob` instead. See: https://github.com/amazon-ion/ion-rust/issues/335") } fn read_clob(&mut self) -> IonResult> { @@ -129,7 +129,7 @@ impl IonReader for Box { Self: Sized, F: FnOnce(&[u8]) -> U, { - todo!("Cannot use `map_clob` via dynamic dispatch. Use `read_clob` instead. See: https://github.com/amzn/ion-rust/issues/335") + todo!("Cannot use `map_clob` via dynamic dispatch. Use `read_clob` instead. See: https://github.com/amazon-ion/ion-rust/issues/335") } fn read_timestamp(&mut self) -> IonResult { diff --git a/src/reader.rs b/src/reader.rs index 84ac727b..57062464 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -334,7 +334,7 @@ impl IonReader for UserReader { // ignored. If the first annotation is something other than `$ion_symbol_table`, // the struct is considered user data even if one of the trailing annotations // is `$ion_symbol_table`. For more information, see this section of the spec: - // https://amzn.github.io/ion-docs/docs/symbols.html#local-symbol-tables + // https://amazon-ion.github.io/ion-docs/docs/symbols.html#local-symbol-tables if self.raw_reader.depth() == 0 { let is_symtab = match self.raw_reader.annotations().next() { Some(Err(error)) => return Err(error), diff --git a/src/shared_symbol_table.rs b/src/shared_symbol_table.rs index 4ffbd6f1..315cc3c7 100644 --- a/src/shared_symbol_table.rs +++ b/src/shared_symbol_table.rs @@ -3,7 +3,7 @@ use crate::IonResult; #[derive(Debug, Clone, PartialEq, Eq)] /// Stores [SharedSymbolTable] with the table name, version and imports -/// For more information on [SharedSymbolTable]: https://amzn.github.io/ion-docs/docs/symbols.html#shared-symbol-tables +/// For more information on [SharedSymbolTable]: https://amazon-ion.github.io/ion-docs/docs/symbols.html#shared-symbol-tables pub struct SharedSymbolTable { name: String, version: usize, diff --git a/src/stream_reader.rs b/src/stream_reader.rs index 8ec32f9e..b2f895aa 100644 --- a/src/stream_reader.rs +++ b/src/stream_reader.rs @@ -108,7 +108,7 @@ pub trait IonReader { /// function passing the string as a parameter. This allows users to avoid materializing the /// string if they only intend to inspect it for length, pattern matches, etc. // TODO: Replace with a `read_str(&self) -> IonResult<&str>` - // See: https://github.com/amzn/ion-rust/issues/335 + // See: https://github.com/amazon-ion/ion-rust/issues/335 fn map_string(&mut self, f: F) -> IonResult where Self: Sized, @@ -119,7 +119,7 @@ pub trait IonReader { /// to optimize this by calling the function without first validating that the bytes are utf8. /// As such, callers MUST NOT depend on the string contents being valid utf8. // TODO: Replace with a `read_string_bytes(&self) -> IonResult<&[u8]>` - // See: https://github.com/amzn/ion-rust/issues/335 + // See: https://github.com/amazon-ion/ion-rust/issues/335 fn map_string_bytes(&mut self, f: F) -> IonResult where Self: Sized, @@ -137,7 +137,7 @@ pub trait IonReader { /// function passing the blob's bytes as a parameter. This allows users to avoid materializing the /// clob if they only intend to inspect it for length, pattern matches, etc. // TODO: Replace with a `read_blob_bytes(&self) -> IonResult<&[u8]>` - // See: https://github.com/amzn/ion-rust/issues/335 + // See: https://github.com/amazon-ion/ion-rust/issues/335 fn map_blob(&mut self, f: F) -> IonResult where Self: Sized, @@ -151,7 +151,7 @@ pub trait IonReader { /// function passing the clob's bytes as a parameter. This allows users to avoid materializing the /// clob if they only intend to inspect it for length, pattern matches, etc. // TODO: Replace with a `read_clob_bytes(&self) -> IonResult<&[u8]]>` - // See: https://github.com/amzn/ion-rust/issues/335 + // See: https://github.com/amazon-ion/ion-rust/issues/335 fn map_clob(&mut self, f: F) -> IonResult where Self: Sized, diff --git a/src/text/non_blocking/raw_text_reader.rs b/src/text/non_blocking/raw_text_reader.rs index 011f621b..40fb1978 100644 --- a/src/text/non_blocking/raw_text_reader.rs +++ b/src/text/non_blocking/raw_text_reader.rs @@ -549,7 +549,7 @@ impl> RawTextReader { // Parses the contents of the text buffer again with the knowledge that we're at the end of the // input stream. This allows us to resolve a number of ambiguous cases. // For a detailed description of the problem that this addresses, please see: - // https://github.com/amzn/ion-rust/issues/318 + // https://github.com/amazon-ion/ion-rust/issues/318 // This method should only be called when the reader is at the top level. An EOF at any other // depth is an error. fn parse_value_at_eof(&mut self) -> RootParseResult { @@ -670,7 +670,7 @@ const EMPTY_SLICE_RAW_SYMBOL_TOKEN: &[RawSymbolToken] = &[]; // A better implementation would identify the input slice containing the next value without // materializing it and then attempt to materialize it when the user calls `read_TYPE`. This // would take less memory and would only materialize values that the user requests. -// See: https://github.com/amzn/ion-rust/issues/322 +// See: https://github.com/amazon-ion/ion-rust/issues/322 impl> IonReader for RawTextReader { type Item = RawStreamItem; type Symbol = RawSymbolToken; diff --git a/src/text/parsers/containers.rs b/src/text/parsers/containers.rs index 03c839c3..42c2b466 100644 --- a/src/text/parsers/containers.rs +++ b/src/text/parsers/containers.rs @@ -85,7 +85,7 @@ pub(crate) fn list_delimiter(input: &str) -> IonParseResult<()> { alt((tag(",").upgrade(), peek(list_end))), ) // TODO: This parser discards the matched &str as a workaround to a limitation in RawTextReader. - // See: https://github.com/amzn/ion-rust/issues/337 + // See: https://github.com/amazon-ion/ion-rust/issues/337 .map(|_| ()) .parse(input) } @@ -220,7 +220,7 @@ pub(crate) fn struct_field_name_or_end(input: &str) -> IonParseResult IonParseResult<()> { preceded(whitespace_or_comments, alt((tag(","), peek(struct_end)))) // TODO: This parser discards the matched &str as a workaround to a limitation in RawTextReader. - // See: https://github.com/amzn/ion-rust/issues/337 + // See: https://github.com/amazon-ion/ion-rust/issues/337 .map(|_| ()) .parse(input) } diff --git a/src/text/parsers/mod.rs b/src/text/parsers/mod.rs index d8845423..26842f9d 100644 --- a/src/text/parsers/mod.rs +++ b/src/text/parsers/mod.rs @@ -1,5 +1,5 @@ //! This module contains logic to parse the the text representation of each Ion type. -//! See: +//! See: use std::str::FromStr; diff --git a/src/text/parsers/text_support.rs b/src/text/parsers/text_support.rs index e8b0799e..c8cf5955 100644 --- a/src/text/parsers/text_support.rs +++ b/src/text/parsers/text_support.rs @@ -82,7 +82,7 @@ pub(crate) fn escaped_char_no_unicode(input: &str) -> IonParseResult IonParseResult { alt(( value('\n', char('n')), diff --git a/src/text/parsers/top_level.rs b/src/text/parsers/top_level.rs index 569c728e..565163d7 100644 --- a/src/text/parsers/top_level.rs +++ b/src/text/parsers/top_level.rs @@ -60,7 +60,7 @@ pub(crate) fn version_int(input: &str) -> IonParseResult<&str> { /// the major and minor version of the Ion stream to follow, respectively. See [version_int]. /// Note that this MUST be an identifier (i.e. an unquoted symbol) and not any other encoding of the /// same symbol value. For more information see: -/// https://amzn.github.io/ion-docs/docs/symbols.html#ion-version-markers +/// https://amazon-ion.github.io/ion-docs/docs/symbols.html#ion-version-markers pub(crate) fn ion_version_marker(input: &str) -> IonParseResult<(u32, u32)> { // See if the input text matches an IVM. If not, return a non-fatal error. let (remaining_input, (_, major_text, _, minor_text)) = delimited( diff --git a/src/text/raw_text_writer.rs b/src/text/raw_text_writer.rs index 23bd3d21..9fb7e873 100644 --- a/src/text/raw_text_writer.rs +++ b/src/text/raw_text_writer.rs @@ -42,7 +42,7 @@ impl RawTextWriterBuilder { /// "hello" /// ``` // This doesn't solve the problem of final newlines. Should find a way to solve that some day. - //TODO: https://github.com/amzn/ion-rust/issues/437 + //TODO: https://github.com/amazon-ion/ion-rust/issues/437 pub fn lines() -> RawTextWriterBuilder { RawTextWriterBuilder { whitespace_config: WhitespaceConfig { @@ -123,7 +123,7 @@ impl RawTextWriterBuilder { containers: vec![EncodingLevel::default()], // Should we validate here that all the strings in `whitespace_config` actually are // semantically whitespace? - //TODO: https://github.com/amzn/ion-rust/issues/438 + //TODO: https://github.com/amazon-ion/ion-rust/issues/438 whitespace_config: Box::new(self.whitespace_config), }; // This method cannot currently fail. It returns an IonResult<_> to be consistent with the diff --git a/src/text/text_writer.rs b/src/text/text_writer.rs index 71b455ad..a7638f8f 100644 --- a/src/text/text_writer.rs +++ b/src/text/text_writer.rs @@ -208,7 +208,7 @@ mod tests { let mut buffer = Vec::new(); let mut text_writer = TextWriterBuilder::new().build(&mut buffer)?; // The following symbol IDs are in the system symbol table. - // https://amzn.github.io/ion-docs/docs/symbols.html#system-symbols + // https://amazon-ion.github.io/ion-docs/docs/symbols.html#system-symbols text_writer.step_in(IonType::Struct)?; text_writer.set_field_name(4); text_writer.set_annotations(&[1]); diff --git a/src/types/mod.rs b/src/types/mod.rs index 51c55827..3d0a5f2a 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -1,5 +1,5 @@ //! This module provides an implementation of the data types described by the -//! [Ion Data Model](http://amzn.github.io/ion-docs/docs/spec.html#the-ion-data-model) +//! [Ion Data Model](https://amazon-ion.github.io/ion-docs/docs/spec.html#the-ion-data-model) //! section of the Ion 1.0 spec. pub type SymbolId = usize; @@ -12,7 +12,7 @@ pub mod timestamp; use std::fmt; /// Represents the Ion data type of a given value. To learn more about each data type, -/// read [the Ion Data Model](http://amzn.github.io/ion-docs/docs/spec.html#the-ion-data-model) +/// read [the Ion Data Model](https://amazon-ion.github.io/ion-docs/docs/spec.html#the-ion-data-model) /// section of the spec. #[derive(Debug, PartialEq, Eq, PartialOrd, Copy, Clone)] pub enum IonType { diff --git a/tests/reexport_external.rs b/tests/reexport_external.rs index a1650c61..925ea35f 100644 --- a/tests/reexport_external.rs +++ b/tests/reexport_external.rs @@ -7,7 +7,7 @@ use ion_rs::types::decimal::Decimal; /// through a reexport. This means that consumers of ion_rs can use this /// integration without having to specify the exact depdendency version. /// -/// See also: https://github.com/amzn/ion-rust/issues/302. +/// See also: https://github.com/amazon-ion/ion-rust/issues/302. #[test] fn bigdecimal_is_reexported() { let ion_rs_type = Decimal::new(0, 0);