aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2018-09-13 10:29:10 -0700
committerZeyla Hellyer <[email protected]>2018-09-13 10:29:10 -0700
commit069daef17ba7bc9241f4170f678e2a236cd51d7f (patch)
treeee0831f90b3bb1d9c9cc475907ab00a798db28c4
parentRevert "Old message on update (#368)" (diff)
downloadserenity-069daef17ba7bc9241f4170f678e2a236cd51d7f.tar.xz
serenity-069daef17ba7bc9241f4170f678e2a236cd51d7f.zip
Change default branch to 'current'
The default branch of 'master' has a few issues, but the biggest technical issue is that it doesn't accurately represent the development work done on it by name alone: is it the branch for maintaining the "current" released version, or for the development of the next majour version? In certain Rust projects these are combined into one branch, but we don't do this, so this is one way out of the ambiguity.
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--README.md6
-rw-r--r--src/client/mod.rs2
-rw-r--r--src/lib.rs4
-rw-r--r--src/utils/vec_map.rs4
5 files changed, 10 insertions, 10 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1a0d8d2..ef553d5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,13 +6,13 @@ determined if the change is something that the community wants.
There are going to (usually) be 3 primary branches:
-- `master`: Development branch of the _most recent_ majour version. For example,
+- `current`: Development branch of the _most recent_ majour version. For example,
if the largest version is v0.5.3, then the v0.5.x series will be on this branch.
Bugfixes, internal rewrites, documentation updates, new features, etc. go here
so long as they do not introduce breaking changes.
- `v0.Y.x`: Development branch of the _second most recent_ majour version. If
the largest version is v0.5.X, then this will be the branch for bugfixes for the
-v0.4.x version series. Bugfixes from the `master` branch may be backported here
+v0.4.x version series. Bugfixes from the `current` branch may be backported here
if applicable.
- `v0.Z.x`: Development branch of the _next_ majour version. Following the same
example, this would be for the v0.6.x version series. This is where breaking
diff --git a/README.md b/README.md
index 28c1578..2498a69 100644
--- a/README.md
+++ b/README.md
@@ -184,7 +184,7 @@ Voice+youtube-dl:
[`Event`]: https://docs.rs/serenity/*/serenity/model/event/enum.Event.html
[`Event::MessageCreate`]: https://docs.rs/serenity/*/serenity/model/event/enum.Event.html#variant.MessageCreatef
[`Shard`]: https://docs.rs/serenity/*/serenity/gateway/struct.Shard.html
-[`examples`]: https://github.com/serenity-rs/serenity/blob/master/examples
+[`examples`]: https://github.com/serenity-rs/serenity/blob/current/examples
[`rest`]: https://docs.rs/serenity/*/serenity/client/rest/index.html
[`validate_token`]: https://docs.rs/serenity/*/serenity/client/fn.validate_token.html
[cache docs]: https://docs.rs/serenity/*/serenity/cache/index.html
@@ -196,7 +196,7 @@ Voice+youtube-dl:
[discord docs]: https://discordapp.com/developers/docs/intro
[docs]: https://docs.rs/serenity
[docs-badge]: https://img.shields.io/badge/docs-online-5023dd.svg?style=flat-square
-[examples]: https://github.com/serenity-rs/serenity/tree/master/examples
+[examples]: https://github.com/serenity-rs/serenity/tree/current/examples
[gateway docs]: https://docs.rs/serenity/*/serenity/gateway/index.html
[guild]: https://discord.gg/WBdGJCc
[guild-badge]: https://img.shields.io/discord/381880193251409931.svg?style=flat-square&colorB=7289DA
@@ -206,6 +206,6 @@ Voice+youtube-dl:
[library:discordrb]: https://github.com/meew0/discordrb
[library:discord.js]: https://github.com/hydrabolt/discord.js
[library:discord.py]: https://github.com/Rapptz/discord.py
-[logo]: https://raw.githubusercontent.com/serenity-rs/serenity/master/logo.png
+[logo]: https://raw.githubusercontent.com/serenity-rs/serenity/current/logo.png
[rust 1.25+ badge]: https://img.shields.io/badge/rust-1.25+-93450a.svg?style=flat-square
[rust 1.25+ link]: https://blog.rust-lang.org/2018/03/29/Rust-1.25.html
diff --git a/src/client/mod.rs b/src/client/mod.rs
index 49061a5..beb4f28 100644
--- a/src/client/mod.rs
+++ b/src/client/mod.rs
@@ -174,7 +174,7 @@ pub struct Client {
/// [`Event::MessageDelete`]: ../model/event/enum.Event.html#variant.MessageDelete
/// [`Event::MessageDeleteBulk`]: ../model/event/enum.Event.html#variant.MessageDeleteBulk
/// [`Event::MessageUpdate`]: ../model/event/enum.Event.html#variant.MessageUpdate
- /// [example 05]: https://github.com/serenity-rs/serenity/tree/master/examples/05_command_framework
+ /// [example 05]: https://github.com/serenity-rs/serenity/tree/current/examples/05_command_framework
pub data: Arc<Mutex<ShareMap>>,
/// A vector of all active shards that have received their [`Event::Ready`]
/// payload, and have dispatched to [`on_ready`] if an event handler was
diff --git a/src/lib.rs b/src/lib.rs
index 0971092..3dc88cc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -97,11 +97,11 @@
//! [`Event`]: model/event/enum.Event.html
//! [`Event::MessageCreate`]: model/event/enum.Event.html#variant.MessageCreate
//! [`Shard`]: gateway/struct.Shard.html
-//! [`examples`]: https://github.com/serenity-rs/serenity/blob/master/examples
+//! [`examples`]: https://github.com/serenity-rs/serenity/blob/current/examples
//! [cache docs]: cache/index.html
//! [client's module-level documentation]: client/index.html
//! [docs]: https://discordapp.com/developers/docs/intro
-//! [examples]: https://github.com/serenity-rs/serenity/tree/master/examples
+//! [examples]: https://github.com/serenity-rs/serenity/tree/current/examples
//! [gateway docs]: gateway/index.html
#![doc(html_root_url = "https://docs.rs/serenity/*")]
#![allow(unknown_lints)]
diff --git a/src/utils/vec_map.rs b/src/utils/vec_map.rs
index d02d659..f910a2e 100644
--- a/src/utils/vec_map.rs
+++ b/src/utils/vec_map.rs
@@ -1,5 +1,5 @@
-// Most of this is
-// shamelessly copied from https://github.com/hyperium/hyper/blob/master/src/header/internals/vec_map.rs
+// Most of this is shamelessly copied from
+// <https://github.com/hyperium/hyper/blob/4351ed1d13e6f66b8dd3ef9f2b74776d02752ed7/src/header/internals/vec_map.rs>
/// Like `HashMap` but solely uses a vector instead.
///