From f633e3106c2cf107925c25e56165d1105020fb14 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Tue, 18 Oct 2022 02:03:29 -0700 Subject: [PATCH 1/6] MIT copyright line Delete the first paragraph of LICENSE-MIT (an inaccurate pseudo-copyright line), leaving only the text of the MIT license. Nothing about the license of proc-macro2 has changed, only our understanding of how to correctly communicate that license has changed. This mirrors an equivalent change applied in the rust-lang/rust repository years ago. --- LICENSE-MIT | 2 -- 1 file changed, 2 deletions(-) diff --git a/LICENSE-MIT b/LICENSE-MIT index 39e0ed66..31aa7938 100644 --- a/LICENSE-MIT +++ b/LICENSE-MIT @@ -1,5 +1,3 @@ -Copyright (c) 2014 Alex Crichton - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the From 975c3248db1947f73784bff21f5643be5d306674 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 25 Nov 2022 18:56:18 -0800 Subject: [PATCH 2/6] Time out workflows after 45 minutes GitHub's default timeout is 6 hours. Recently some of my GitHub Actions jobs have started randomly stalling for that long, which is inconvenient because it ties up a chunk of my runner quota. It apepars to be very rare for a job to recover after stalling. It's better to time out quicker and retry on a different runner. --- .github/workflows/ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32773a64..356b3866 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,7 @@ jobs: fail-fast: false matrix: rust: [1.31.0, stable, beta] + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@master @@ -39,6 +40,7 @@ jobs: nightly: name: Rust nightly runs-on: ubuntu-latest + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@nightly @@ -64,6 +66,7 @@ jobs: webassembly: name: WebAssembly runs-on: ubuntu-latest + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@nightly @@ -74,6 +77,7 @@ jobs: fuzz: name: Fuzz runs-on: ubuntu-latest + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@nightly @@ -84,6 +88,7 @@ jobs: name: Clippy runs-on: ubuntu-latest if: github.event_name != 'pull_request' + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@clippy @@ -93,6 +98,7 @@ jobs: miri: name: Miri runs-on: ubuntu-latest + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/rust-toolchain@miri @@ -104,6 +110,7 @@ jobs: name: Outdated runs-on: ubuntu-latest if: github.event_name != 'pull_request' + timeout-minutes: 45 steps: - uses: actions/checkout@v3 - uses: dtolnay/install@cargo-outdated From b4fa77fea75aff08f630252587230eaf1d00eb12 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 15 Dec 2022 17:52:41 -0800 Subject: [PATCH 3/6] Update build status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70b6c869..131ba513 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [github](https://github.com/dtolnay/proc-macro2) [crates.io](https://crates.io/crates/proc-macro2) [docs.rs](https://docs.rs/proc-macro2) -[build status](https://github.com/dtolnay/proc-macro2/actions?query=branch%3Amaster) +[build status](https://github.com/dtolnay/proc-macro2/actions?query=branch%3Amaster) A wrapper around the procedural macro API of the compiler's `proc_macro` crate. This library serves two purposes: From a83ad604b1ac46072e24c6fc6e6f9d8e828358e4 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 17 Dec 2022 11:29:38 -0800 Subject: [PATCH 4/6] Release 1.0.48 --- Cargo.toml | 2 +- src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 273683a5..adba8ff8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proc-macro2" -version = "1.0.47" # remember to update html_root_url +version = "1.0.48" # remember to update html_root_url authors = ["David Tolnay ", "Alex Crichton "] autobenches = false categories = ["development-tools::procedural-macro-helpers"] diff --git a/src/lib.rs b/src/lib.rs index 3fda02d5..ceee9aac 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -86,7 +86,7 @@ //! a different thread. // Proc-macro2 types in rustdoc of other crates get linked to here. -#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.47")] +#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.48")] #![cfg_attr( any(proc_macro_span, super_unstable), feature(proc_macro_span, proc_macro_span_shrink) From 6b9ee3dbf69d3a089d8a42b5f99a2c285609919b Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 18 Dec 2022 09:30:26 -0800 Subject: [PATCH 5/6] Opt out -Zrustdoc-scrape-examples on docs.rs I'd like a chance to audit all the code that rustdoc is inserting into the docs. Currently I am skeptical that showing proc-macro2's internal usages of APIs is a net benefit to the public documentation. I am also skeptical that quite so many examples are needed, and that they should be featured so prominently in comparison to handwritten docs. Lastly I wish there were a way to turn this behavior off on a more granular basis. --- Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index adba8ff8..1145eddc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,6 +37,9 @@ span-locations = [] # This feature no longer means anything. nightly = [] +[lib] +doc-scrape-examples = false + [workspace] members = ["benches/bench-libproc-macro", "tests/ui"] From 293705d8dfe424bd3062195b17b41d7d935dc08f Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 18 Dec 2022 09:30:58 -0800 Subject: [PATCH 6/6] Release 1.0.49 --- Cargo.toml | 2 +- src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1145eddc..0ed4a1b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "proc-macro2" -version = "1.0.48" # remember to update html_root_url +version = "1.0.49" # remember to update html_root_url authors = ["David Tolnay ", "Alex Crichton "] autobenches = false categories = ["development-tools::procedural-macro-helpers"] diff --git a/src/lib.rs b/src/lib.rs index ceee9aac..50f942ea 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -86,7 +86,7 @@ //! a different thread. // Proc-macro2 types in rustdoc of other crates get linked to here. -#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.48")] +#![doc(html_root_url = "https://docs.rs/proc-macro2/1.0.49")] #![cfg_attr( any(proc_macro_span, super_unstable), feature(proc_macro_span, proc_macro_span_shrink)